tree 2de4436a11d178d26f187825b649af47b0b6ab4e
parent f40aac940aa83645ec2218ccce90cc1c6881b74c
parent 6fd210a9cc398ecbff7bcdbe220651b73b654f56
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1249915827 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1249915827 +0100

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