summaryrefslogtreecommitdiffstats
path: root/drivers/lguest
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-07 00:02:37 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-07 00:02:37 +0100
commitedf7c8148ec40c0fd27c0ef3f688defcc65e3913 (patch)
treedde7448208538c616ad3ba25b41a816fccc015af /drivers/lguest
parentMerge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff)
parentMerge branch 'mce-inject' of git://git.kernel.org/pub/scm/linux/kernel/git/ra... (diff)
downloadlinux-edf7c8148ec40c0fd27c0ef3f688defcc65e3913.tar.xz
linux-edf7c8148ec40c0fd27c0ef3f688defcc65e3913.zip
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86: add IRQ context simulation in module mce-inject x86, mce, therm_throt: Don't report power limit and package level thermal throttle events in mcelog x86, MCE: Drain mcelog buffer x86, mce: Add wrappers for registering on the decode chain
Diffstat (limited to 'drivers/lguest')
0 files changed, 0 insertions, 0 deletions