]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 04:57:06 +0000 (14:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 04:57:06 +0000 (14:57 +1000)
commit672de43a7b0ab3bb3b36eb0ad1a67e0973201197
tree9299e163a7ed683e6115ad75fd98a39ab3201a55
parentba179dc417be41a1a31b666a5bc43d32b6d33842
parent551b5e1b1e047290f7ab24dee68926783a76d815
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-lpc32xx/common.c
MAINTAINERS
arch/arm/Kconfig
arch/arm/mach-at91/at91rm9200.c
arch/arm/mach-at91/at91rm9200_devices.c
arch/arm/mach-at91/include/mach/hardware.h
drivers/i2c/busses/Kconfig
drivers/i2c/busses/i2c-mxs.c
drivers/input/touchscreen/Kconfig
drivers/net/ethernet/nxp/lpc_eth.c
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile