Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
authorJeff Garzik <jgarzik@pobox.com>
Wed, 13 Jul 2005 20:23:51 +0000 (16:23 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 13 Jul 2005 20:23:51 +0000 (16:23 -0400)
commit327309e899662b482c58cf25f574513d38b5788c
tree069de438aa0e92dd9b6ba28e6b207e2cd07151a5
parent0c168775709faa74c1b87f1e61046e0c51ade7f3
parentc32511e2718618f0b53479eb36e07439aa363a74
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
include/linux/etherdevice.h
net/Kconfig