Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

author Russell King <rmk@dyn-67.arm.linux.org.uk>

Wed, 5 Aug 2009 21:10:52 +0000 (22:10 +0100)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Wed, 5 Aug 2009 21:10:52 +0000 (22:10 +0100)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 5 Aug 2009 21:10:52 +0000 (22:10 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Wed, 5 Aug 2009 21:10:52 +0000 (22:10 +0100)
diff --cc arch/arm/mach-omap2/serial.c
Simple merge
diff --cc arch/arm/plat-omap/gpio.c
Simple merge
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Wed, 5 Aug 2009 21:10:52 +0000 (22:10 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Wed, 5 Aug 2009 21:10:52 +0000 (22:10 +0100)
		1	2
arch/arm/mach-omap2/serial.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/gpio.c	patch \|	diff1 \|	diff2 \|	blob \| history