]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6a9530f655386f160643358ff0875563f2017c6b
tree78f8ebbbc2e730b8e510e3a68b5b73755196fb68
parent27d9d5e4b168156cb6ce28009097222a20819068
parent90035f61168153741f5014b7ac3d772673fc774b
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