Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 21 Jun 2013 19:42:30 +0000 (15:42 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 21 Jun 2013 19:42:30 +0000 (15:42 -0400)
Conflicts:
net/wireless/nl80211.c

1  2 
drivers/net/wireless/iwlegacy/3945-mac.c
drivers/net/wireless/iwlegacy/4965-mac.c
net/wireless/core.c
net/wireless/nl80211.c

Simple merge
Simple merge