Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorLarry Finger <Larry.Finger@lwfinger.net>
Fri, 20 Aug 2010 21:49:37 +0000 (16:49 -0500)
committerLarry Finger <Larry.Finger@lwfinger.net>
Fri, 20 Aug 2010 21:49:37 +0000 (16:49 -0500)

Trivial merge