1
0
Fork 0
alistair23-linux/fs/affs
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
..
Changes Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Kconfig fs/Kconfig: move affs out 2009-01-22 13:15:56 +03:00
Makefile fs: change to new flag variable 2011-03-17 14:02:57 +01:00
affs.h switch affs 2011-01-12 20:03:42 -05:00
amigaffs.c fs: dcache per-inode inode alias locking 2011-01-07 17:50:31 +11:00
bitmap.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
dir.c sanitize ->fsync() for affs 2009-06-11 21:36:14 -04:00
file.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
inode.c new helper: ihold() 2010-10-25 21:26:11 -04:00
namei.c switch affs 2011-01-12 20:03:42 -05:00
super.c switch affs 2011-01-12 20:03:42 -05:00
symlink.c Fix remount races with symlink handling in affs 2010-01-26 22:22:24 -05:00