| commit | 751516f0a9bad32544f40f471037c0e45fb639c9 | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Sun May 29 04:40:39 2011 -0400 |
| committer | Len Brown <len.brown@intel.com> | Sun May 29 04:40:39 2011 -0400 |
| tree | 8bdd745909a1523f720ae978c12b9c686d58baaa | |
| parent | 6288cf1e768ae73db5ddaaae54d85245cc1c2b56 [diff] | |
| parent | 08b53f0e6b565fe8dc0b8f929960ed16d76291bd [diff] |
Merge branch 'ec-cleanup' into release Conflicts: drivers/platform/x86/compal-laptop.c