Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorroot <root@dyn-67.arm.linux.org.uk>
Tue, 24 Mar 2009 22:04:25 +0000 (22:04 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 24 Mar 2009 22:04:25 +0000 (22:04 +0000)
commit9a38e989b8ce04923f919fc2a8a24eb07fb484e2
tree6b99638dc32b99420ada46ca8d1373ad7aa5a208
parent7d83f8fca517b123cf0136503a9e50974f65ec49
parent5fa82eb8ff06cd3ac4d64c6875922ae1dfa003c5
Merge branch 'devel' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
MAINTAINERS
arch/arm/mach-pxa/tosa.c
arch/arm/mm/Kconfig
drivers/video/pxafb.c