Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Sun, 20 Apr 2008 00:38:13 +0000 (20:38 -0400)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Sun, 20 Apr 2008 00:38:13 +0000 (20:38 -0400)
commit03414e57ad9875d0c8bfa5a4a65813cb2157372e
tree836db238d42a6282a5ac2241363eb8b6db190ab7
parent3925e6fc1f774048404fdd910b0345b06c699eb4
parent3ee08aea72f44a6d176af7a97f3ad0c67bc65a44
Merge branch 'master' of git://git./linux/kernel/git/hskinnemoen/tclib into base
drivers/misc/Kconfig
drivers/misc/Makefile