Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 30 Jan 2013 19:23:08 +0000 (14:23 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 30 Jan 2013 19:23:08 +0000 (14:23 -0500)
commit1698c6db420bc131d4b34bc39913ee817aa47312
tree8aeb9e25bba5d4cc3a893827d30913d83ea32fdf
parent20fb9e50338199d9e88512703af4c560ab53bad4
parentd13f1862c0ad892eded4cdf633ab32bc993cc1d9
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next
drivers/net/wireless/iwlwifi/dvm/mac80211.c
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/iwlwifi/pcie/rx.c