a3233b
Merge branch 'users/mkoutny/fixes/linux-4.12/for-next' into fixes/linux-4.12 Pull a blacklist update from Michal Koutny. Conflicts: blacklist.conf