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>
Mon, 29 Dec 2008 18:08:11 +0000 (18:08 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 29 Dec 2008 18:08:11 +0000 (18:08 +0000)
commit47992cbdaef2f18a47871b2ed01ad27f568c8b73
treebfed4f8c7ea3164afc75a85ab3624586c37c37f4
parent4655a0de36e8e903e99a8d152818e3aae86dae1a
parent198fc108ee4c2cd3f08954eae6a819c81c03214b
Merge branch 'for-rmk' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/time.c
drivers/video/Kconfig
drivers/video/pxafb.c
drivers/watchdog/sa1100_wdt.c