Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 10 Aug 2009 14:50:27 +0000 (15:50 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 10 Aug 2009 14:50:27 +0000 (15:50 +0100)
1  2 
arch/arm/mach-omap2/board-overo.c
arch/arm/plat-omap/gpio.c

Simple merge
Simple merge