]> err.no Git - linux-2.6/commit
Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Sat, 23 Sep 2006 00:10:23 +0000 (20:10 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 23 Sep 2006 00:10:23 +0000 (20:10 -0400)
commit28eb177dfa5982d132edceed891cb3885df258bb
tree5f8fdc37ad1d8d0793e9c47da7d908b97c814ffb
parentfd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b
parentdb392219c5f572610645696e3672f6ea38783a65
Merge branch 'master' into upstream

Conflicts:

net/ieee80211/ieee80211_crypt_tkip.c
net/ieee80211/ieee80211_crypt_wep.c
MAINTAINERS
drivers/net/bmac.c
drivers/net/ibmveth.c
drivers/net/mace.c
drivers/net/sungem.c
drivers/net/wireless/airo.c
net/ieee80211/ieee80211_crypt_ccmp.c
net/ieee80211/ieee80211_crypt_tkip.c
net/ieee80211/ieee80211_crypt_wep.c