linux-hardened/fs/hfsplus
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
..
bfind.c hfsplus: over 80 character lines clean-up 2010-12-16 18:08:45 +01:00
bitmap.c hfsplus: over 80 character lines clean-up 2010-12-16 18:08:45 +01:00
bnode.c hfsplus: %L-to-%ll, macro correction, and remove unneeded braces 2010-12-16 18:08:46 +01:00
brec.c hfsplus: over 80 character lines clean-up 2010-12-16 18:08:45 +01:00
btree.c hfsplus: over 80 character lines clean-up 2010-12-16 18:08:45 +01:00
catalog.c hfsplus: over 80 character lines clean-up 2010-12-16 18:08:45 +01:00
dir.c switch hfsplus 2011-01-12 20:02:45 -05:00
extents.c hfsplus: fix up a comparism in hfsplus_file_extend 2011-02-03 16:34:18 -07:00
hfsplus_fs.h Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus 2011-01-07 17:16:27 -08:00
hfsplus_raw.h hfsplus: over 80 character lines clean-up 2010-12-16 18:08:45 +01:00
inode.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
ioctl.c userns: rename is_owner_or_cap to inode_owner_or_capable 2011-03-23 19:47:13 -07:00
Kconfig fs/Kconfig: move hfs, hfsplus out 2009-01-22 13:15:57 +03:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
options.c hfsplus: over 80 character lines clean-up 2010-12-16 18:08:45 +01:00
part_tbl.c hfsplus: do not leak buffer on error 2011-02-03 16:34:05 -07:00
super.c hfsplus: fix failed mount handling 2011-02-03 16:33:51 -07:00
tables.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
unicode.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus 2011-01-07 17:16:27 -08:00
wrapper.c hfsplus: fix two memory leaks in wrapper.c 2011-02-03 16:34:11 -07:00