]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit21560caca87c0dbb22d8026d8f494c9999a8b6a5
tree8d6905466a05d6539e06d189cf88b71095ac0a79
parent543db69bc9e4c8a137be8c6c24999b836f1728de
parent133e7eb40cedcc8fda9eb98d9c2be7cf6d831aa8
Merge branch 'master' of git://git.kernel.org/pub/scm/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