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)
commit7d2a47aab2a511c87a96238977e04e6378969d45
treee3765af6d4b292d8f3c013a5962324eab683a931
parentfedaf4ffc224a194e2d13a3ec2abe5df0bc94258
parentb887664d882ee4f6a67e0bf05e5f141d32fcc067
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
net/wireless/nl80211.c
drivers/net/wireless/iwlegacy/3945-mac.c
drivers/net/wireless/iwlegacy/4965-mac.c
net/wireless/core.c
net/wireless/nl80211.c