| commit | 4fb1db334aa2569281481a09840650e7be28161d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 05 17:27:55 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 05 17:27:55 2011 -0800 |
| tree | fb413fdd3a6e843ae4f03969c3bf497f410ab898 | |
| parent | 45e713efe2fa574b6662e7fb63fae9497c5e03d4 [diff] | |
| parent | 11948b9335865dc0ba3a5ca2c9c255291a8d50fb [diff] |
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: toshiba_acpi: Fix machines that don't support HCI_SYSTEM_EVENT