Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem
Linus Torvalds [Thu, 26 May 2011 17:50:56 +0000 (10:50 -0700)]
* '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

1  2 
drivers/xen/Makefile
fs/btrfs/extent_io.c
fs/buffer.c
fs/ext4/super.c
fs/super.c
include/linux/fs.h
mm/filemap.c

Simple merge
@@@ -10,7 -10,7 +10,8 @@@
  #include <linux/swap.h>
  #include <linux/writeback.h>
  #include <linux/pagevec.h>
 +#include <linux/prefetch.h>
+ #include <linux/cleancache.h>
  #include "extent_io.h"
  #include "extent_map.h"
  #include "compat.h"
diff --cc fs/buffer.c
Simple merge
diff --cc fs/ext4/super.c
Simple merge
diff --cc fs/super.c
Simple merge
Simple merge
diff --cc mm/filemap.c
Simple merge