Merge branch 'master' into for-linus
authorJens Axboe <jaxboe@fusionio.com>
Tue, 1 Jun 2010 10:42:12 +0000 (12:42 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Tue, 1 Jun 2010 10:42:12 +0000 (12:42 +0200)
commitb4ca761577535b2b4d153689ee97342797dfff05
tree29054d55508f1faa22ec32acf7c245751af03348
parent28f4197e5d4707311febeec8a0eb97cb5fd93c97
parent67a3e12b05e055c0415c556a315a3d3eb637e29e
Merge branch 'master' into for-linus

Conflicts:
fs/pipe.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
fs/fs-writeback.c
fs/pipe.c
fs/sync.c