]> 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)
commitf9bdd4e28bd88154b7c57fceca66564ad1515259
treef8e90adadfde630368034268de8cc5763898ab37
parentc76a16d05f8a49a682a9b00b1e59181e2ebef8be
parente6bee8e1234d13829b9cf0cc16e7e841707b3c7e
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