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)
commit96a4d1e23439e2356a105791bda95cc08d375b97
tree2de4436a11d178d26f187825b649af47b0b6ab4e
parentf40aac940aa83645ec2218ccce90cc1c6881b74c
parent6fd210a9cc398ecbff7bcdbe220651b73b654f56
Merge branch 'pm-upstream/fixes' of git://git./linux/kernel/git/khilman/linux-omap-pm
arch/arm/mach-omap2/board-overo.c
arch/arm/plat-omap/gpio.c