Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...
Haavard Skinnemoen [Sun, 20 Apr 2008 00:38:13 +0000 (20:38 -0400)]
1  2 
drivers/misc/Kconfig
drivers/misc/Makefile

Simple merge
Simple merge