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

Trivial merge