1
0
Fork 0
alistair23-linux/fs/hpfs
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
..
Kconfig hpfs: remove the BKL 2011-03-02 22:27:36 +01:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
alloc.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
anode.c sanitize signedness/const for pointers to char in hpfs a bit 2010-03-03 14:07:57 -05:00
buffer.c hpfs: Convert sbi->hpfs_creation_de to mutex 2010-10-30 10:12:03 +02:00
dentry.c switch hpfs 2011-01-12 20:02:47 -05:00
dir.c hpfs: remove the BKL 2011-03-02 22:27:36 +01:00
dnode.c sanitize signedness/const for pointers to char in hpfs a bit 2010-03-03 14:07:57 -05:00
ea.c sanitize signedness/const for pointers to char in hpfs a bit 2010-03-03 14:07:57 -05:00
file.c Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block 2011-03-24 10:16:26 -07:00
hpfs.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
hpfs_fn.h hpfs: remove the BKL 2011-03-02 22:27:36 +01:00
inode.c hpfs: remove the BKL 2011-03-02 22:27:36 +01:00
map.c sanitize signedness/const for pointers to char in hpfs a bit 2010-03-03 14:07:57 -05:00
name.c sanitize signedness/const for pointers to char in hpfs a bit 2010-03-03 14:07:57 -05:00
namei.c hpfs: remove the BKL 2011-03-02 22:27:36 +01:00
super.c hpfs: remove the BKL 2011-03-02 22:27:36 +01:00