Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...

author Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

Sun, 20 Apr 2008 00:38:13 +0000 (20:38 -0400)

committer Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

Sun, 20 Apr 2008 00:38:13 +0000 (20:38 -0400)
author Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Sun, 20 Apr 2008 00:38:13 +0000 (20:38 -0400)
committer Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Sun, 20 Apr 2008 00:38:13 +0000 (20:38 -0400)
diff --cc drivers/misc/Kconfig
Simple merge
diff --cc drivers/misc/Makefile
Simple merge
author	Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
	Sun, 20 Apr 2008 00:38:13 +0000 (20:38 -0400)
committer	Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
	Sun, 20 Apr 2008 00:38:13 +0000 (20:38 -0400)
		1	2
drivers/misc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history