Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 5 Aug 2009 21:10:52 +0000 (22:10 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 5 Aug 2009 21:10:52 +0000 (22:10 +0100)
commit13efdbecc65ef6ec4028551fb223dea5c5e3143c
tree634a2ce082abe3eb2a5defe0f1ddc2f3eb10f085
parent61f4a10cb4e9447a85245c63b3e7f46e09299fed
parent6fd210a9cc398ecbff7bcdbe220651b73b654f56
Merge branch 'pm-upstream/fixes' of git://git./linux/kernel/git/khilman/linux-omap-pm into devel-stable
arch/arm/mach-omap2/serial.c
arch/arm/plat-omap/gpio.c