Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Nov 2010 21:57:11 +0000 (06:57 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Nov 2010 21:57:11 +0000 (06:57 +0900)
commitc42978f7ecaa5c29bdd5fea507e09e6eff9d9f27
treef5aa36fa1714e907c14eb84c779dd07d2818045e
parent91d95fda8594ce5e0ccd81381ee7b956cf513c59
parentbe6528b2e58d92ef2ffed6f130e2d42bb85dbf29
Merge git://git./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)