]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'at91/at91-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 01:20:36 +0000 (11:20 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 01:20:36 +0000 (11:20 +1000)
commit90b3e3322fe6443c2b1e6a0fd22a35e4c420b2c7
tree4287713a127547b4f33518e294087f09e5f0bc7f
parent45285da029c760ca6a4f0a8dac422af25aa1ea12
parent5430cfc583fd8ec5e1bb2d211de29b23743122e4
Merge remote-tracking branch 'at91/at91-next'

Conflicts:
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-at91/at91cap9_devices.c
arch/arm/mach-at91/at91rm9200_devices.c
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-at91/at91sam9261_devices.c
arch/arm/mach-at91/at91sam9263_devices.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9g45_devices.c
arch/arm/mach-at91/board-usb-a926x.c