tree fb413fdd3a6e843ae4f03969c3bf497f410ab898
parent 45e713efe2fa574b6662e7fb63fae9497c5e03d4
parent 11948b9335865dc0ba3a5ca2c9c255291a8d50fb
author Linus Torvalds <torvalds@linux-foundation.org> 1323134875 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1323134875 -0800

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