Staging: merge 2.6.39-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 13 Apr 2011 19:14:05 +0000 (12:14 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 13 Apr 2011 19:14:05 +0000 (12:14 -0700)
This was done to handle a number of conflicts, the majority of which
were caused by the big "fix spelling issues" patch.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Trivial merge