Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 23 Dec 2008 18:06:37 +0000 (18:06 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 23 Dec 2008 18:06:37 +0000 (18:06 +0000)
commit40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb
tree0d949c487ba15c4c8198a69cd7b8c0cdb5773af4
parentd83a12a40915774332cec625856c2e7ba9033e15
parent3b24f30c4f678cfab5c6d090af9559fefa37cc41
Merge branch 'for-rmk' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

Conflicts:

arch/arm/mach-pxa/am200epd.c
arch/arm/mach-pxa/ezx.c
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/am200epd.c
arch/arm/mach-pxa/e400.c
arch/arm/mach-pxa/ezx.c
arch/arm/mach-pxa/gumstix.c
arch/arm/mach-pxa/pcm990-baseboard.c
drivers/video/pxafb.c