diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-07-12 08:13:13 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-07-12 08:13:13 -0500 |
| commit | 075516ed1000e949a81cf36c476001f085e819ba (patch) | |
| tree | 4fcaef098f0919469f26ad9ebea85ace8e015a4d /drivers/dsp/syslink/procmgr/Kbuild | |
| parent | d0847352c50142fb850826e0beb1bb77fded22f9 (diff) | |
| parent | a94e782f2cc7a762c2208fbdb64a5ca5d331f357 (diff) | |
Merge branch 'omap4_next' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into L24x8L24.8-pre-release
Conflicts:
arch/arm/plat-omap/Makefile
Signed-off-by: Ricardo Perez Olivares <x0081762@ti.com>
Diffstat (limited to 'drivers/dsp/syslink/procmgr/Kbuild')
0 files changed, 0 insertions, 0 deletions