]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorLarry Finger <Larry.Finger@lwfinger.net>
Mon, 23 Aug 2010 01:44:03 +0000 (20:44 -0500)
committerLarry Finger <Larry.Finger@lwfinger.net>
Mon, 23 Aug 2010 01:44:03 +0000 (20:44 -0500)

Trivial merge