]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'highbank/soc' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Wed, 2 Nov 2011 01:46:10 +0000 (02:46 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 2 Nov 2011 01:46:10 +0000 (02:46 +0100)
commit8d1888caacdc48a6b1b40ab88b659251b11db15a
tree019689fb9d129404af1efba4df10975bc9e0a57a
parent9b409f04c7ffa127abdc016aab46a567154c72ed
parent151bba34b4a9be3937f3b88fb5c8c9d6c3dd9f08
Merge branch 'highbank/soc' into next/soc

Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-omap2/board-generic.c
arch/arm/plat-mxc/include/mach/gpio.h
12 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-imx/mach-mx27ads.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/devices.c
arch/arm/plat-mxc/include/mach/gpio.h
arch/arm/plat-omap/devices.c
drivers/gpio/gpio-omap.c