Merge branch 'pm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/khilman/linux...
authorTony Lindgren <tony@atomide.com>
Thu, 21 Jan 2010 02:20:47 +0000 (18:20 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 21 Jan 2010 02:20:47 +0000 (18:20 -0800)
commitccaae273c3f92d7e7acb796d6747077a93dcca4b
tree3b3853db3d4b0db18c9cbc51469538aa767aeaee
parentfa8d1d6c2a72659f773f919c4356b68884c875d0
parent6b34f9d4e60a4fb9f847533a207e31316603e840
Merge branch 'pm-fixes' of /linux/kernel/git/khilman/linux-omap-pm into omap-fixes-for-linus