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)
commit884897e6a10a86de0e611a76f4bf3fd0068a672c
tree019689fb9d129404af1efba4df10975bc9e0a57a
parentc72dbae971400e466ad9ff16c920cd6d9d8c55a1
parent8b61f37440388ebbd2a894178fe098f2e70ab392
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