]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit65b796d204662cede8567ac2d567b59ad310b9e9
tree29054d55508f1faa22ec32acf7c245751af03348
parent833616bf79e8dee75a83b2d9d9814d3b11543c2a
parent3173211281a3ce3c9872737cb9c520fbba09227a
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