tree ce41b6e0fa10982a306f6c142a92dbf3c9961284
parent b492e95be0ae672922f4734acf3f5d35c30be948
parent d515e86e639890b33a09390d062b0831664f04a2
author Jens Axboe <jens.axboe@oracle.com> 1274470046 +0200
committer Jens Axboe <jens.axboe@oracle.com> 1274470046 +0200

Merge branch 'master' into for-2.6.35

Conflicts:
	fs/ext3/fsync.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>