From: Kalle Valo Date: Fri, 17 Jul 2015 08:19:08 +0000 (+0300) Subject: Merge tag 'iwlwifi-for-kalle-2015-06-12' of https://git.kernel.org/pub/scm/linux... X-Git-Tag: v4.2-rc4~25^2~6^2 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/df2cd4586f177acf9493dee079fc7d18268c5f54 Merge tag 'iwlwifi-for-kalle-2015-06-12' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes * bug fixes specific for 8000 series * fix a crash in time events * fix a crash in PCIe transport * fix BT Coex code that prevented association on certain devices (3160). * revert the new RBD allocation model because it introduced a bug when running on weak VM setups. * a new device IDs --- df2cd4586f177acf9493dee079fc7d18268c5f54