Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2...
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 5 May 2005 02:52:45 +0000 (19:52 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 5 May 2005 02:52:45 +0000 (19:52 -0700)
1  2 
drivers/char/Kconfig

Simple merge