linux-hardened/fs/sysv
Linus Torvalds 6c51038900 Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits)
  Documentation/iostats.txt: bit-size reference etc.
  cfq-iosched: removing unnecessary think time checking
  cfq-iosched: Don't clear queue stats when preempt.
  blk-throttle: Reset group slice when limits are changed
  blk-cgroup: Only give unaccounted_time under debug
  cfq-iosched: Don't set active queue in preempt
  block: fix non-atomic access to genhd inflight structures
  block: attempt to merge with existing requests on plug flush
  block: NULL dereference on error path in __blkdev_get()
  cfq-iosched: Don't update group weights when on service tree
  fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away
  block: Require subsystems to explicitly allocate bio_set integrity mempool
  jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  fs: make fsync_buffers_list() plug
  mm: make generic_writepages() use plugging
  blk-cgroup: Add unaccounted time to timeslice_used.
  block: fixup plugging stubs for !CONFIG_BLOCK
  block: remove obsolete comments for blkdev_issue_zeroout.
  blktrace: Use rq->cmd_flags directly in blk_add_trace_rq.
  ...

Fix up conflicts in fs/{aio.c,super.c}
2011-03-24 10:16:26 -07:00
..
balloc.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
dir.c clean up write_begin usage for directories in pagecache 2010-08-09 16:47:31 -04:00
file.c remove inode_setattr 2010-08-09 16:47:37 -04:00
ialloc.c switch sysv to ->evict_inode() 2010-08-09 16:47:59 -04:00
inode.c fs: icache RCU free inodes 2011-01-07 17:50:26 +11:00
itree.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
Kconfig fs/Kconfig: move sysv out 2009-01-22 13:15:59 +03:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
namei.c sysv: i_nlink races in rename() 2011-03-03 01:28:16 -05:00
super.c switch sysv 2011-01-12 20:02:44 -05:00
symlink.c [PATCH] mark struct inode_operations const 3 2007-02-12 09:48:46 -08:00
sysv.h clean up write_begin usage for directories in pagecache 2010-08-09 16:47:31 -04:00