| commit | 8171d88089ad63fc442b2bf32af7c18653adc5cb | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Wed Nov 11 15:21:24 2009 -0800 |
| committer | Tony Lindgren <tony@atomide.com> | Wed Nov 11 15:21:24 2009 -0800 |
| tree | dfde2fd974b8d15d1a1a5a2c13d57d5fe9dd8e76 | |
| parent | 4d0226042c05588be47b06bc1dbe7a09c9c540a4 [diff] | |
| parent | cf22854cee10e16e28b1dde136c37e82b7d503ee [diff] |
Merge branch 'pm-upstream/pm-cpuidle' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into 7xx-iosplit-plat-merge