Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Dec 2011 01:27:55 +0000 (17:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Dec 2011 01:27:55 +0000 (17:27 -0800)
commit4fb1db334aa2569281481a09840650e7be28161d
treefb413fdd3a6e843ae4f03969c3bf497f410ab898
parent45e713efe2fa574b6662e7fb63fae9497c5e03d4
parent11948b9335865dc0ba3a5ca2c9c255291a8d50fb
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