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)
commit897f5ab2cd733a77a2279268262919caa8154b9d
tree95866d31faa6db4ec786399296238344c7cfea0c
parent1d42a0ecf478962e8aede355a0be41365c117ff0
parentb48fc7bb3868abffc89ce70d4baf324574338d8e
Merge ... /linux/kernel/git/aegl/linux-2.6.git
drivers/char/Kconfig