Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.
authorJeff Garzik <jgarzik@pobox.com>
Thu, 30 Jun 2005 04:49:18 +0000 (00:49 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 30 Jun 2005 04:49:18 +0000 (00:49 -0400)
commit0c168775709faa74c1b87f1e61046e0c51ade7f3
treec40fd8818c64c5d7d1d90afab0bd6ffd94505526
parent9bd481f85940726bf66aae5cd03c5b912ad0ae4c
parent9b4311eedb17fa88f02e4876cd6aa9a08e383cd6
Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.
include/linux/etherdevice.h