tree f00be0b726748113ffeb4e1caf7ade7ef33cfabe
parent 8ecada16512c90ae782b00f15ebff0c32e4cd92a
parent 07bc9dc1b01bad7084fed3d2659e5d83317869bc
author Jiri Kosina <jkosina@suse.cz> 1374748227 +0200
committer Jiri Kosina <jkosina@suse.cz> 1374748249 +0200

Merge branch 'master' into for-next

Sync with Linus' master to be able to apply
trivial patche to newer code.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>