]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab47999 70c07e0)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 17 Feb 2006 13:15:41 +0000 (08:15 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 17 Feb 2006 13:15:41 +0000 (08:15 -0500)
1  2 
drivers/net/wireless/Kconfig patch | diff1 | diff2 | blob | history

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