git.baikalelectronics.ru Git - kernel.git/commit

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

author	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 26 May 2011 17:50:56 +0000 (10:50 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 26 May 2011 17:50:56 +0000 (10:50 -0700)
commit	c4fcf59810a0a565e69d9c31d59a4f1c8c4e0aed
tree	98d4da8d0e1a5fb1d9064626b4b96d95ccf26375	tree \| snapshot
parent	4aae5752fe9dfb167490797b1b602439426e6d9b	commit \| diff
parent	9953e7c5d4574e6c8d85331cbf6a005d68fdf8ae	commit \| diff

drivers/xen/Makefile	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.c	diff1 \|	diff2 \|	blob \| history
fs/buffer.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	diff1 \|	diff2 \|	blob \| history
fs/super.c	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history
mm/filemap.c	diff1 \|	diff2 \|	blob \| history