]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d42a0e b48fc7b)
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 patch | diff1 | diff2 | blob | history

diff --cc drivers/char/Kconfig
Simple merge
Linux 2.6 source tree