diff options
| author | Len Brown <len.brown@intel.com> | 2011-07-14 00:16:38 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-07-14 00:16:38 -0400 |
| commit | 7fb574a97f7147610c44cef55d0cde2409392a80 (patch) | |
| tree | 5743047d3efb8535167b8c1b177dd8e9518208c8 /include/acpi | |
| parent | b4a03b9aa96cc186bf3cfd7a55cb7d7227f0cf4d (diff) | |
| parent | 4d2b2956ef1113f1cc43e98e947c20d9c7d2712c (diff) | |
| parent | 07e49a7a31153a95caa270d8ad7350a0bcd4d511 (diff) | |
| download | linux-7fb574a97f7147610c44cef55d0cde2409392a80.tar.gz linux-7fb574a97f7147610c44cef55d0cde2409392a80.tar.bz2 linux-7fb574a97f7147610c44cef55d0cde2409392a80.zip | |
Merge branches 'd3cold', 'bugzilla-37412' and 'bugzilla-38152' into release