Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 10 Apr 2013 18:10:24 +0000 (14:10 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 10 Apr 2013 18:10:24 +0000 (14:10 -0400)
commitd72c728210fa803a21203360c0f40b32972d795a
tree95189c1a9181e3317dea2a139f390f5013e921a2
parent655d8e2328a6ef6b6b514609a4c1e33508d3a1da
parent2d055afdcada4bd8b510e9d2a8566fbded3c9696
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next
drivers/net/wireless/iwlwifi/dvm/lib.c
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/iwlwifi/pcie/tx.c