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

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

Wed, 28 Mar 2012 02:15:01 +0000 (22:15 -0400)

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

Wed, 28 Mar 2012 02:15:01 +0000 (22:15 -0400)
author David S. Miller <davem@davemloft.net>
Wed, 28 Mar 2012 02:15:01 +0000 (22:15 -0400)
committer David S. Miller <davem@davemloft.net>
Wed, 28 Mar 2012 02:15:01 +0000 (22:15 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/wireless/iwlegacy/4965-mac.c
Simple merge
diff --cc include/net/cfg80211.h
Simple merge
author	David S. Miller <davem@davemloft.net>
	Wed, 28 Mar 2012 02:15:01 +0000 (22:15 -0400)
committer	David S. Miller <davem@davemloft.net>
	Wed, 28 Mar 2012 02:15:01 +0000 (22:15 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/4965-mac.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	patch \|	diff1 \|	diff2 \|	blob \| history