| commit | c42978f7ecaa5c29bdd5fea507e09e6eff9d9f27 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 25 06:57:11 2010 +0900 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 25 06:57:11 2010 +0900 |
| tree | f5aa36fa1714e907c14eb84c779dd07d2818045e | |
| parent | 91d95fda8594ce5e0ccd81381ee7b956cf513c59 [diff] | |
| parent | be6528b2e58d92ef2ffed6f130e2d42bb85dbf29 [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: 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)