commit | ccaae273c3f92d7e7acb796d6747077a93dcca4b | [log] [tgz] |
---|---|---|
author | Tony Lindgren <tony@atomide.com> | Wed Jan 20 18:20:47 2010 -0800 |
committer | Tony Lindgren <tony@atomide.com> | Wed Jan 20 18:20:47 2010 -0800 |
tree | 3b3853db3d4b0db18c9cbc51469538aa767aeaee | |
parent | fa8d1d6c2a72659f773f919c4356b68884c875d0 [diff] | |
parent | 6b34f9d4e60a4fb9f847533a207e31316603e840 [diff] |
Merge branch 'pm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-fixes-for-linus