Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[pandora-kernel.git] / fs / eventfd.c
diff --cc fs/eventfd.c
Simple merge