tree 98d4da8d0e1a5fb1d9064626b4b96d95ccf26375
parent 8a0599dd2471f2a2e409498c08a0ab339057ad06
parent 5bc20fc59706214d9591c11e1938a629d3538c12
author Linus Torvalds <torvalds@linux-foundation.org> 1306432256 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1306432256 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem:
  xen: cleancache shim to Xen Transcendent Memory
  ocfs2: add cleancache support
  ext4: add cleancache support
  btrfs: add cleancache support
  ext3: add cleancache support
  mm/fs: add hooks to support cleancache
  mm: cleancache core ops functions and config
  fs: add field to superblock to support cleancache
  mm/fs: cleancache documentation

Fix up trivial conflict in fs/btrfs/extent_io.c due to includes