]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 03:13:57 +0000 (14:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 03:13:57 +0000 (14:13 +1100)
commitbce9e2b5bc5c18e63b11173ee0b00ba1f929fd0b
tree89178513db9cb808e233a65f068ed79f1fbdc6cc
parentc985809d130017abd77d49d4303233ca577bf4ae
parente38d457de7be63e6ced1ea254aa51466deb1fef0
Merge remote-tracking branch 'pinctrl/for-next'

Conflicts:
arch/arm/boot/dts/spear1340.dtsi
18 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/boot/dts/at91sam9260.dtsi
arch/arm/boot/dts/at91sam9263.dtsi
arch/arm/boot/dts/at91sam9g45.dtsi
arch/arm/boot/dts/at91sam9x5.dtsi
arch/arm/boot/dts/spear1340.dtsi
arch/arm/boot/dts/spear310.dtsi
arch/arm/boot/dts/spear320.dtsi
arch/arm/mach-at91/at91rm9200.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/at91sam9x5.c
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-u300/core.c