Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

Wed, 11 Nov 2009 19:38:16 +0000 (11:38 -0800)

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

Wed, 11 Nov 2009 19:38:16 +0000 (11:38 -0800)
author David S. Miller <davem@davemloft.net>
Wed, 11 Nov 2009 19:38:16 +0000 (11:38 -0800)
committer David S. Miller <davem@davemloft.net>
Wed, 11 Nov 2009 19:38:16 +0000 (11:38 -0800)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/wireless/ath/ath5k/base.c
Simple merge
diff --cc drivers/net/wireless/ath/ath5k/led.c
Simple merge
diff --cc drivers/net/wireless/b43/main.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Wed, 11 Nov 2009 19:38:16 +0000 (11:38 -0800)
committer	David S. Miller <davem@davemloft.net>
	Wed, 11 Nov 2009 19:38:16 +0000 (11:38 -0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/base.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/led.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	patch \|	diff1 \|	diff2 \|	blob \| history