Merge branch 'sa1111' into sa11x0
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:54:16 +0000 (23:54 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:54:16 +0000 (23:54 +0100)
commit374da9da22ebaad0524c77905b5e89ae4619bef3
tree78f8ebbbc2e730b8e510e3a68b5b73755196fb68
parentfbae0f8912dc12b284433c05417ea76311205bbf
parent81e6ca3eb74d6bdbab181dd2db378f49f76f0d97
Merge branch 'sa1111' into sa11x0

Conflicts:
arch/arm/common/sa1111.c
arch/arm/mach-sa1100/neponset.c

Fixed:
arch/arm/mach-sa1100/assabet.c
for the neponset changes
arch/arm/mach-sa1100/assabet.c
arch/arm/mach-sa1100/badge4.c
arch/arm/mach-sa1100/jornada720.c
arch/arm/mach-sa1100/neponset.c