Merge branch 'master' of /home/gregkh/linux/git/torvalds-2.6
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 23 Dec 2009 18:00:05 +0000 (10:00 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 23 Dec 2009 18:00:05 +0000 (10:00 -0800)

Trivial merge