aboutsummaryrefslogtreecommitdiff
path: root/drivers/oprofile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-07 18:49:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-07 18:49:20 -0700
commitf5284e7635787224dda1a2bf82a4c56b1c75671f (patch)
tree885730ccc2e890368e9012869e54538182fda8f7 /drivers/oprofile
parent3eac4abaa69949af0e2f64e5c55ee8a22bbdd3e7 (diff)
parent320718ee074acce5ffced6506cb51af1388942aa (diff)
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/oprofile')
0 files changed, 0 insertions, 0 deletions