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)
commitb0df3bd1e553e901ec7297267611a5db88240b38
tree3eceef36f96a6cf187cf8c4072fd83b4f6435315
parentcc3afe6f856054a3752ef2b3ccc5eebf33bd5024
parenta67ab2bde752b26be75d4b68ecead9a14692eac5
Merge branch 'upstream' of git://git./linux/kernel/git/linville/wireless-2.6 into tmp
include/linux/netdevice.h