Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next

author Mark Brown <broonie@opensource.wolfsonmicro.com>

Sun, 2 Dec 2012 04:34:58 +0000 (13:34 +0900)

committer Mark Brown <broonie@opensource.wolfsonmicro.com>

Sun, 2 Dec 2012 04:34:58 +0000 (13:34 +0900)
author Mark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Dec 2012 04:34:58 +0000 (13:34 +0900)
committer Mark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Dec 2012 04:34:58 +0000 (13:34 +0900)
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_devices.c
Simple merge
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Sun, 2 Dec 2012 04:34:58 +0000 (13:34 +0900)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Sun, 2 Dec 2012 04:34:58 +0000 (13:34 +0900)
		1	2
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_devices.c	patch \|	diff1 \|	diff2 \|	blob \| history