]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff1d276 43f66a6)
Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211
author <jgarzik@pretzel.yyz.us> <>
Sat, 28 May 2005 02:02:58 +0000 (22:02 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 28 May 2005 02:02:58 +0000 (22:02 -0400)
1  2 
drivers/net/wireless/Kconfig patch | diff1 | diff2 | blob | history
drivers/net/wireless/Makefile patch | diff1 | diff2 | blob | history

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