summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-05 17:27:55 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-05 17:27:55 -0800
commit4fb1db334aa2569281481a09840650e7be28161d (patch)
treefb413fdd3a6e843ae4f03969c3bf497f410ab898 /kernel
parent45e713efe2fa574b6662e7fb63fae9497c5e03d4 (diff)
parent11948b9335865dc0ba3a5ca2c9c255291a8d50fb (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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions