Merge branch 'master' into for-2.6.35
authorJens Axboe <jens.axboe@oracle.com>
Fri, 21 May 2010 19:27:26 +0000 (21:27 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Fri, 21 May 2010 19:27:26 +0000 (21:27 +0200)
commitee9a3607fb03e804ddf624544105f4e34260c380
treece41b6e0fa10982a306f6c142a92dbf3c9961284
parentb492e95be0ae672922f4734acf3f5d35c30be948
parentd515e86e639890b33a09390d062b0831664f04a2
Merge branch 'master' into for-2.6.35

Conflicts:
fs/ext3/fsync.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
13 files changed:
block/blk-cgroup.c
block/cfq-iosched.c
drivers/block/drbd/drbd_worker.c
fs/ext3/fsync.c
fs/fcntl.c
fs/gfs2/rgrp.c
fs/nilfs2/the_nilfs.c
fs/xfs/linux-2.6/xfs_super.c
include/linux/fs.h
init/Kconfig
kernel/sysctl.c
kernel/trace/trace.c
net/core/skbuff.c