Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 18 Mar 2013 13:39:21 +0000 (09:39 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 18 Mar 2013 13:39:21 +0000 (09:39 -0400)
commit49c87cd1eac1f798c5bad7f7eb809e6df36b6c56
tree8d6905466a05d6539e06d189cf88b71095ac0a79
parent4969b41798e512689bba57c8c44d873216eba814
parent9437a248e7cac427c898bdb11bd1ac6844a1ead4
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
net/nfc/llcp/llcp.c
MAINTAINERS
drivers/net/wireless/ath/ath9k/common.h
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/mwifiex/pcie.c
net/nfc/llcp/llcp.c
net/nfc/llcp/sock.c