From: Linus Torvalds Date: Wed, 24 Nov 2010 21:57:11 +0000 (+0900) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c42978f7ecaa5c29bdd5fea507e09e6eff9d9f27;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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) --- c42978f7ecaa5c29bdd5fea507e09e6eff9d9f27