Merge branch 'master' into work
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 29 Nov 2010 18:44:22 +0000 (10:44 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 29 Nov 2010 18:44:22 +0000 (10:44 -0800)

Trivial merge