1
0
Fork 0
alistair23-linux/fs/udf
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 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 2011-01-11 14:45:52 -08:00
Makefile switch udf to simple_fsync() 2009-06-11 21:36:13 -04:00
balloc.c udf: use little-endian bitops 2011-03-23 19:46:19 -07:00
dir.c udf: Remove unnecessary bkl usages 2011-01-06 17:03:57 +01:00
directory.c udf: Remove dead code 2009-09-14 19:13:00 +02:00
ecma_167.h Remove struct typedefs from fs/udf/ecma_167.h et al. 2009-04-02 12:29:47 +02: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
ialloc.c udf: Move handling of uniqueID into a helper function and protect it by a s_alloc_mutex 2011-01-06 17:03:55 +01:00
inode.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
lowlevel.c udf: Remove dead code 2009-09-14 19:13:00 +02:00
misc.c Fix the udf code not to pass structs on stack where possible. 2009-04-02 12:29:47 +02:00
namei.c exportfs: Return the minimum required handle size 2011-03-14 09:15:28 -04:00
osta_udf.h Remove struct typedefs from fs/udf/ecma_167.h et al. 2009-04-02 12:29:47 +02:00
partition.c udf: Use of s_alloc_mutex to serialize udf_relocate_blocks() execution 2011-01-06 17:03:56 +01:00
super.c Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 2011-01-11 14:45:52 -08:00
symlink.c udf: Replace bkl with the UDF_I(inode)->i_data_sem for protect udf_inode_info struct 2011-01-06 17:03:56 +01:00
truncate.c udf: Convert UDF to new truncate calling sequence 2011-02-23 11:00:37 +01:00
udf_i.h udf: Replace bkl with the UDF_I(inode)->i_data_sem for protect udf_inode_info struct 2011-01-06 17:03:56 +01:00
udf_sb.h udf: Protect default inode credentials by rwlock 2011-01-06 17:03:55 +01:00
udfdecl.h udf: Convert UDF to new truncate calling sequence 2011-02-23 11:00:37 +01:00
udfend.h Remove struct typedefs from fs/udf/ecma_167.h et al. 2009-04-02 12:29:47 +02:00
udftime.c Remove struct typedefs from fs/udf/ecma_167.h et al. 2009-04-02 12:29:47 +02:00
unicode.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