tree 29054d55508f1faa22ec32acf7c245751af03348
parent 28f4197e5d4707311febeec8a0eb97cb5fd93c97
parent 67a3e12b05e055c0415c556a315a3d3eb637e29e
author Jens Axboe <jaxboe@fusionio.com> 1275388932 +0200
committer Jens Axboe <jaxboe@fusionio.com> 1275388932 +0200

Merge branch 'master' into for-linus

Conflicts:
	fs/pipe.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>