summaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/hp-wmi.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-11 12:46:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-11 12:46:39 -0700
commit83e95697143d341f3c670c4c5cda0268ae198e63 (patch)
treec7591f919b31c93250d7da438baca348c33703f3 /drivers/platform/x86/hp-wmi.c
parent404ba3f029a53597928a20ce33351e77e3259840 (diff)
parent7f7e37115a8b6724f26d0637a04e1d35e3c59717 (diff)
Merge branch 'movieboard' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'movieboard' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: ohci: do not bind to Pinnacle cards, avert panic
Diffstat (limited to 'drivers/platform/x86/hp-wmi.c')
0 files changed, 0 insertions, 0 deletions