summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-25 06:57:11 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-25 06:57:11 +0900
commitc42978f7ecaa5c29bdd5fea507e09e6eff9d9f27 (patch)
treef5aa36fa1714e907c14eb84c779dd07d2818045e /usr
parent91d95fda8594ce5e0ccd81381ee7b956cf513c59 (diff)
parentbe6528b2e58d92ef2ffed6f130e2d42bb85dbf29 (diff)
downloadlinux-c42978f7ecaa5c29bdd5fea507e09e6eff9d9f27.tar.gz
linux-c42978f7ecaa5c29bdd5fea507e09e6eff9d9f27.tar.bz2
linux-c42978f7ecaa5c29bdd5fea507e09e6eff9d9f27.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: virtio: fix format of sysfs driver/vendor files Char: virtio_console, fix memory leak virtio: return correct capacity to users module: Update prototype for ref_module (formerly use_module)
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions