Merge branch 'at91/defconfig' into next/cleanup
authorOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 06:02:34 +0000 (22:02 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 06:02:34 +0000 (22:02 -0800)
1  2 
arch/arm/mach-at91/at91rm9200_devices.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-at91/at91sam9261_devices.c
arch/arm/mach-at91/at91sam9263_devices.c

Simple merge