Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Tue, 26 Sep 2006 00:09:14 +0000 (20:09 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 26 Sep 2006 00:09:14 +0000 (20:09 -0400)
1  2 
include/linux/netdevice.h

Simple merge