Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
authorLarry Finger <Larry.Finger@lwfinger.net>
Tue, 9 Aug 2011 21:01:09 +0000 (16:01 -0500)
committerLarry Finger <Larry.Finger@lwfinger.net>
Tue, 9 Aug 2011 21:01:09 +0000 (16:01 -0500)

Trivial merge