Merge branch 'for-4.12/upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 20 Jun 2017 08:52:46 +0000 (10:52 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 20 Jun 2017 08:52:46 +0000 (10:52 +0200)
commit900a88ef348803cd2ad2aeb13ffe06e807c6ce65
tree029a287c2d0e8cac2f4c33f7bde37ab981cd3cd8
parent0ca4cd7bccf0b82d2c10069f295772bb7b76d006
parent53145c2e354b5a5ed031cec7472b4f16bab060c7
Merge branch 'for-4.12/upstream-fixes' into for-linus