summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/mcheck/mce-severity.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-20 10:39:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-20 10:39:33 -0700
commit73bebc8bafb6a880a4db63d60bc4b8d9d6879c9e (patch)
tree94c107c369f0334b67649711d4b019abbb3e5382 /arch/x86/kernel/cpu/mcheck/mce-severity.c
parentedaf6c38344b026aec8be852bf7ddd9916eedf9e (diff)
parent2198edddd8f0245d4c47419310c6cfb0f4e1a197 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina: "Fix for one particular device (bluetooth Tivo Slide) and change of 'default y' -> 'default n' for CONFIG_HID_BATTERY_STRENGTH which I overlooked in the initial merge of the battery support" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: default HID_BATTERY_STRENGTH to no HID: tivo: fix support for bluetooth version of tivo Slide
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce-severity.c')
0 files changed, 0 insertions, 0 deletions