projects / platform / upstream / kernel-adaptation-pc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 034ee29 5839fec)
Merge branch 'next/fixes' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 22:25:41 +0000 (23:25 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 22:25:41 +0000 (23:25 +0100)
commit3e965b176341b78620f7404fd8b7f9a0d061f8a2
treea2dbf06d6ae20fbe417b70f0a471cc4f93ff0a71tree | snapshot
parent034ee299122c6b145d6d3cafb9ef5c329a4ab990commit | diff
parent5839fec9d8db35b2b07359b18a77295418e239adcommit | diff
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
21 files changed:
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/arm/mach-davinci/dm355.c diff1 | diff2 | blob | history
arch/arm/mach-davinci/dm644x.c diff1 | diff2 | blob | history
arch/arm/mach-davinci/dm646x.c diff1 | diff2 | blob | history
arch/arm/mach-mx5/pm-imx5.c diff1 | diff2 | blob | history
arch/arm/mach-mxs/include/mach/gpio.h diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-2430sdp.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-4430sdp.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-generic.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-h4.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-ldp.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/devices.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/hsmmc.c diff1 | diff2 | blob | history
arch/arm/mach-prima2/prima2.c diff1 | diff2 | blob | history
arch/arm/mach-u300/Kconfig diff1 | diff2 | blob | history
arch/arm/mach-u300/core.c diff1 | diff2 | blob | history
arch/arm/mach-ux500/board-mop500-pins.c diff1 | diff2 | blob | history
arch/arm/mach-ux500/board-mop500.c diff1 | diff2 | blob | history
arch/arm/plat-mxc/include/mach/gpio.h diff1 | diff2 | blob | history
arch/arm/plat-mxc/include/mach/iomux-v3.h diff1 | diff2 | blob | history
arch/arm/plat-omap/devices.c diff1 | diff2 | blob | history
Domain: System / Uncategorized;