Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Mar 2014 18:33:19 +0000 (14:33 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Mar 2014 18:33:19 +0000 (14:33 -0400)
commit3e3cb6caea8a86cebfafed349184c125d563cbc1
tree3c0100030687c63e6c31a49b1aa4c8fec35f45bf
parent1698aca04085a98e0e22256c0a7f0e686d982084
parent82e5a649453a3cf23516277abb84273768a1592b
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes
drivers/net/wireless/iwlwifi/mvm/bt-coex.c
drivers/net/wireless/iwlwifi/pcie/drv.c