]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
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)
1  2 
include/linux/etherdevice.h

Simple merge