Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@evo.osdl.org>
Mon, 5 Sep 2005 07:12:58 +0000 (00:12 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Mon, 5 Sep 2005 07:12:58 +0000 (00:12 -0700)
commite766f1cc596078b1603ac2c96617660c4c7e2d81
tree86f24a621dbe39fd25dcec539c2f969f50bfbcab
parent48467641bcc057f7cba3b6cbbe66cb834d64cc81
parentebede60741e2cec6d210f137fd22a30e37abc0be
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6
drivers/char/Kconfig