]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'sa11x0-lcd' into sa11x0
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:55:54 +0000 (23:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:55:54 +0000 (23:55 +0100)
commit28fe6abfa9134bcefa07d0c31df74c1d044beb35
treef8e90adadfde630368034268de8cc5763898ab37
parent9a1dfe467cdc947ed2934eade5d9eac8da6b0c28
parentfeed23b4ef385d109e0842ca524df39e96464f10
Merge branch 'sa11x0-lcd' into sa11x0

Conflicts:
arch/arm/mach-sa1100/assabet.c
arch/arm/mach-sa1100/assabet.c
arch/arm/mach-sa1100/collie.c
arch/arm/mach-sa1100/generic.c
arch/arm/mach-sa1100/include/mach/SA-1100.h
arch/arm/mach-sa1100/shannon.c