tree 8f23201e88c120769cec6fb70f3084cd492ac624
parent 9a1bd63cdae4b623494c4ebaf723a91c35ec49fb
parent 535b3ddc285825c058cef3436a9aa207edffa6cd
parent 26029d88ad1ba6ad7d1f16f22dc67aa8eac0d391
author Jiri Kosina <jkosina@suse.cz> 1434983216 +0200
committer Jiri Kosina <jkosina@suse.cz> 1434983216 +0200

Merge branches 'for-4.1/upstream-fixes', 'for-4.2/kaslr' and 'for-4.2/upstream' into for-linus