diff options
| author |   Len Brown <len.brown@intel.com> | 2011-05-29 04:40:39 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-05-29 04:40:39 -0400 |
| commit | 751516f0a9bad32544f40f471037c0e45fb639c9 (patch) | |
| tree | 8bdd745909a1523f720ae978c12b9c686d58baaa /fs | |
| parent | Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release (diff) | |
| parent | ACPI EC: remove redundant code (diff) | |
| download | linux-dev-751516f0a9bad32544f40f471037c0e45fb639c9.tar.xz linux-dev-751516f0a9bad32544f40f471037c0e45fb639c9.zip | |
Merge branch 'ec-cleanup' into release
Conflicts:
drivers/platform/x86/compal-laptop.c
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions