summaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-30 10:16:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-30 10:16:42 -0700
commit87156d692afdc4c689e99380a263445217a4b76c (patch)
tree918cd55f9338626c2d354cfe8b6a66e451fedf99 /drivers/xen
parente4049eb8527668a6c7f97b944970b81d1316d5b0 (diff)
parentc61fae964a5ee04c4e4a01caecaf778c2e26e589 (diff)
downloadlinux-87156d692afdc4c689e99380a263445217a4b76c.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: serial: drivers/serial/pmac_zilog.c: add missing unlock serial: 8250_pnp - add Fujitsu Wacom device tty: Fix regressions in the char driver conversion
Diffstat (limited to 'drivers/xen')
0 files changed, 0 insertions, 0 deletions