Merge remote-tracking branch 'at91/at91-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 9 Sep 2011 01:20:36 +0000 (11:20 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 9 Sep 2011 01:20:36 +0000 (11:20 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 01:20:36 +0000 (11:20 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 01:20:36 +0000 (11:20 +1000)
diff --cc arch/arm/mach-at91/at91cap9_devices.c
Simple merge
diff --cc arch/arm/mach-at91/at91rm9200_devices.c
Simple merge
diff --cc arch/arm/mach-at91/at91sam9260_devices.c
Simple merge
diff --cc arch/arm/mach-at91/at91sam9261_devices.c
Simple merge
diff --cc arch/arm/mach-at91/at91sam9263_devices.c
Simple merge
diff --cc arch/arm/mach-at91/at91sam9g45.c
Simple merge
diff --cc arch/arm/mach-at91/at91sam9g45_devices.c
Simple merge
diff --cc arch/arm/mach-at91/board-usb-a926x.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 9 Sep 2011 01:20:36 +0000 (11:20 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 9 Sep 2011 01:20:36 +0000 (11:20 +1000)
		1	2
arch/arm/mach-at91/at91cap9_devices.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91rm9200_devices.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9260_devices.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9261_devices.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9263_devices.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9g45.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9g45_devices.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/board-usb-a926x.c	patch \|	diff1 \|	diff2 \|	blob \| history