tree 634a2ce082abe3eb2a5defe0f1ddc2f3eb10f085
parent 61f4a10cb4e9447a85245c63b3e7f46e09299fed
parent 6fd210a9cc398ecbff7bcdbe220651b73b654f56
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1249506652 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1249506652 +0100

Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-stable