[CRIU] [PATCH 2/4] common: Move compiler.h into

[Cyrill Gorcunov]

On Fri, Oct 21, 2016 at 02:51:23PM +0300, Cyrill Gorcunov wrote:
> Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
> 
> # Conflicts:
> #	criu/cgroup-props.c
> #	criu/cr-restore.c
> #	criu/crtools.c
> #	criu/eventfd.c
> #	criu/eventpoll.c
> #	criu/filesystems.c

Could you please drop this "Conflicts" mark from the text.
For some reason git didn't ignore them while cherry-picking.