Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorDavid S. Miller <davem@davemloft.net>
Wed, 28 Mar 2012 02:15:01 +0000 (22:15 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Mar 2012 02:15:01 +0000 (22:15 -0400)
commit7dd30d447b7f4a129586cce8e57d0163dde876b0
treef6a3c26bccbd31e144c8c68fda979988739d4af5
parentde8856d2c11f562c60ed9340a83db4a4f829a6e6
parent643c61e119459e9d750087b7b34be94491efebf9
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless
MAINTAINERS
drivers/net/wireless/iwlegacy/4965-mac.c
include/net/cfg80211.h