]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 04:45:43 +0000 (15:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 04:45:43 +0000 (15:45 +1100)
commit2eb424ff3181770554cc6e51c0a4305b8f639c70
tree3ecc76b5cd4df0ba200b58895ff87f3c120b6b58
parent7abc076f76a3d279c21ecca86d05e85bcaa3144b
parent5ad6b8734b5fb28bb2cf793fa074ddcffb369764
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/boot/dts/snowball.dts
MAINTAINERS
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/boot/dts/dbx5x0.dtsi
arch/arm/boot/dts/href.dtsi
arch/arm/boot/dts/snowball.dts
arch/arm/mach-at91/at91sam9g45_devices.c
arch/arm/mach-omap2/timer.c
arch/arm/plat-orion/Makefile
drivers/net/ethernet/smsc/smsc911x.c
drivers/pinctrl/pinctrl-samsung.c