]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0238cb4 fb453d4)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 16 Jan 2006 00:43:29 +0000 (16:43 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 16 Jan 2006 00:43:29 +0000 (16:43 -0800)
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/net/Kconfig patch | diff1 | diff2 | blob | history

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