android_kernel_samsung_msm8976/fs/logfs
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
..
compr.c zlib: slim down zlib_deflate() workspace when possible 2011-03-22 17:44:17 -07:00
dev_bdev.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
dev_mtd.c
dir.c fs: provide rcu-walk aware permission i_ops 2011-01-07 17:50:29 +11:00
file.c userns: rename is_owner_or_cap to inode_owner_or_capable 2011-03-23 19:47:13 -07:00
gc.c
inode.c fs: icache RCU free inodes 2011-01-07 17:50:26 +11:00
journal.c logfs: fix deadlock in logfs_get_wblocks, hold and wait on super->s_write_mutex 2010-12-22 19:43:33 -08:00
Kconfig
logfs.h fs: logfs: Fix up MTD=y build. 2010-11-01 16:34:56 -04:00
logfs_abi.h
Makefile
readwrite.c logfs: fix "Kernel BUG at readwrite.c:1193" 2010-12-22 19:43:33 -08:00
segment.c
super.c switch logfs to ->mount() 2010-10-29 04:16:51 -04:00