Merge commit 'd0f294cec0ee25461a0a15b889929c5c7dc983cd' into upstream-merge
commiteffbd5079bbbe1ee29115d4a87755d1824934a47
authorMarcelo Tosatti <mtosatti@redhat.com>
Wed, 16 Feb 2011 19:13:34 +0000 (16 17:13 -0200)
committerMarcelo Tosatti <mtosatti@redhat.com>
Wed, 16 Feb 2011 19:13:34 +0000 (16 17:13 -0200)
treeda986f2cf85f60733bca10894e0e014eb81c159c
parent612a0f9f7614e4a070871da99288e83eef1dbc9f
parentd0f294cec0ee25461a0a15b889929c5c7dc983cd
Merge commit 'd0f294cec0ee25461a0a15b889929c5c7dc983cd' into upstream-merge

* commit 'd0f294cec0ee25461a0a15b889929c5c7dc983cd':
  Set up signalfd under !CONFIG_IOTHREAD

Conflicts:
cpus.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Makefile.objs
cpus.c