]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34afd63 d0bbccf)
Merge branch 'sky2'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 12 Nov 2005 03:48:14 +0000 (22:48 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 12 Nov 2005 03:48:14 +0000 (22:48 -0500)
1  2 
drivers/net/Kconfig patch | diff1 | diff2 | blob | history

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