Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@evo.osdl.org>
Mon, 5 Sep 2005 07:11:50 +0000 (00:11 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Mon, 5 Sep 2005 07:11:50 +0000 (00:11 -0700)
commit48467641bcc057f7cba3b6cbbe66cb834d64cc81
treef7c5c5e964c220de30fcdcd06b0f1efdb3e22439
parent3863e72414fa2ebf5f3b615d1bf99de32e59980a
parentd70063c4634af060a5387337b7632f6334ca3458
Merge /pub/scm/linux/kernel/git/davem/net-2.6
drivers/net/wireless/airo.c