bccc37
Merge branch 'SLE12-SP5' of kerncvs.suse.de:/home/git/kernel-source into SLE12-SP5 Conflicts: blacklist.conf