| commit | 4c89aad9f4803875f7065e825badc9ba61922091 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Thu Dec 08 13:22:57 2011 -0800 |
| committer | Tony Lindgren <tony@atomide.com> | Thu Dec 08 13:22:57 2011 -0800 |
| tree | d0c60e673e527085aaddd76fb512311aa6159e40 | |
| parent | deee6d5359969a0ce4e2760cfd7b9f379bd5698a [diff] | |
| parent | ff819da44258ca12b9f60dfd589884106e5a3129 [diff] |
Merge branch 'for_3.3/pm/omap4-mpuss' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap4