]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/stable/stable...
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 14 Dec 2009 17:50:09 +0000 (09:50 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 14 Dec 2009 17:50:09 +0000 (09:50 -0800)

Trivial merge