commit | 112258b1d215a16d575dc6ace344a0bb7196c19c | [log] [tgz] |
---|---|---|
author | Tony Lindgren <tony@atomide.com> | Mon Jan 31 13:20:26 2011 -0800 |
committer | Tony Lindgren <tony@atomide.com> | Mon Jan 31 13:20:26 2011 -0800 |
tree | d96e08ee64f1c98da9da6156ef12954869846db4 | |
parent | 0e6d8cad448bde3d846961bb43db15daae94562e [diff] | |
parent | 8353584eae4af8f37e5a23b63ed816c79185a9c9 [diff] |
Merge branch 'for_2.6.38/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-fixes