Merge branch 'for-4.1/core-s390' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 13 Apr 2015 21:57:27 +0000 (23:57 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 13 Apr 2015 21:57:27 +0000 (23:57 +0200)

Trivial merge