]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a241359 d279490)
Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 6 Sep 2006 15:06:44 +0000 (11:06 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 6 Sep 2006 15:06:44 +0000 (11:06 -0400)
1  2 
drivers/net/Kconfig patch | diff1 | diff2 | blob | history

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