Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
authorLarry Finger <Larry.Finger@lwfinger.net>
Tue, 23 Aug 2011 22:19:00 +0000 (17:19 -0500)
committerLarry Finger <Larry.Finger@lwfinger.net>
Tue, 23 Aug 2011 22:19:00 +0000 (17:19 -0500)

Trivial merge