Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorLarry Finger <Larry.Finger@lwfinger.net>
Thu, 26 Aug 2010 20:11:25 +0000 (15:11 -0500)
committerLarry Finger <Larry.Finger@lwfinger.net>
Thu, 26 Aug 2010 20:11:25 +0000 (15:11 -0500)
commit0a2f38193d60edd22f9e06e31ea8db791d42b3e0
tree9734f14a4ef5b3e620c68eee1028ac5bee032671
parent4684fe01c7a64d24b0e39d033a02d4c2d2cbc256
parentd4348c678977c7093438bbbf2067c49396ae941b
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
drivers/staging/Kconfig
drivers/staging/Makefile