Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
[pandora-kernel.git] / fs / pipe.c
diff --cc fs/pipe.c
Simple merge