tree c61e7108034bf1230024880ec8ae46a9617077c2
parent e9ddd77a31e6ba2867b9c33547f6f079d55f7a72
parent 73beece9ca07c003e0e4f4825b12be167334d4ad
author David Sterba <dsterba@suse.com> 1456497512 +0100
committer David Sterba <dsterba@suse.com> 1456497512 +0100

Merge branch 'foreign/liubo/replace-lockup' into for-chris-4.6