Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
authorKalle Valo <kvalo@codeaurora.org>
Thu, 1 Feb 2018 08:37:39 +0000 (10:37 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 1 Feb 2018 08:37:39 +0000 (10:37 +0200)
The last pull request didn't make it to v4.15 (I was too late) so pull it to
wireless-drivers-next.git instead so that it can go to v4.16.

1  2 
drivers/ssb/Kconfig

Simple merge