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)
1  2 
drivers/staging/Kconfig
drivers/staging/Makefile

Simple merge
Simple merge