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
This commit is contained in:
Linus Torvalds 2011-12-05 17:27:55 -08:00
commit 4fb1db334a