Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

author David S. Miller <davem@davemloft.net>

Sat, 27 Feb 2010 10:05:54 +0000 (02:05 -0800)

committer David S. Miller <davem@davemloft.net>

Sat, 27 Feb 2010 10:05:54 +0000 (02:05 -0800)
author David S. Miller <davem@davemloft.net>
Sat, 27 Feb 2010 10:05:54 +0000 (02:05 -0800)
committer David S. Miller <davem@davemloft.net>
Sat, 27 Feb 2010 10:05:54 +0000 (02:05 -0800)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/wireless/b43/main.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c
Simple merge
diff --cc include/linux/netdevice.h
Simple merge
author	David S. Miller <davem@davemloft.net>
	Sat, 27 Feb 2010 10:05:54 +0000 (02:05 -0800)
committer	David S. Miller <davem@davemloft.net>
	Sat, 27 Feb 2010 10:05:54 +0000 (02:05 -0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	patch \|	diff1 \|	diff2 \|	blob \| history