summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300/Makefile.boot
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 23:25:41 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-31 23:25:41 +0100
commit3e965b176341b78620f7404fd8b7f9a0d061f8a2 (patch)
treea2dbf06d6ae20fbe417b70f0a471cc4f93ff0a71 /arch/arm/mach-u300/Makefile.boot
parentMerge branch 'depends/omap2_dss' into next/cleanup (diff)
parentMerge branch 'depends/rmk/memory_h' into next/fixes (diff)
downloadlinux-3e965b176341b78620f7404fd8b7f9a0d061f8a2.tar.xz
linux-3e965b176341b78620f7404fd8b7f9a0d061f8a2.zip
Merge branch 'next/fixes' into next/cleanup
Conflicts: arch/arm/mach-mxs/include/mach/gpio.h arch/arm/plat-mxc/include/mach/gpio.h drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c
Diffstat (limited to 'arch/arm/mach-u300/Makefile.boot')
0 files changed, 0 insertions, 0 deletions