summaryrefslogtreecommitdiffstats
path: root/drivers/edac/i5100_edac.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-08 03:49:20 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-08 03:49:20 +0200
commitf5284e7635787224dda1a2bf82a4c56b1c75671f (patch)
tree885730ccc2e890368e9012869e54538182fda8f7 /drivers/edac/i5100_edac.c
parentrwsem generic spinlock: use IRQ save/restore spinlocks (diff)
parenthvc_console: Fix race between hvc_close and hvc_remove (diff)
downloadlinux-f5284e7635787224dda1a2bf82a4c56b1c75671f.tar.xz
linux-f5284e7635787224dda1a2bf82a4c56b1c75671f.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: hvc_console: Fix race between hvc_close and hvc_remove virtio: disable multiport console support. virtio: console makes incorrect assumption about virtio API virtio: console: Fix early_put_chars usage MAINTAINERS: Put the virtio-console entry in correct alphabetical order
Diffstat (limited to 'drivers/edac/i5100_edac.c')
0 files changed, 0 insertions, 0 deletions