diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 21:50:56 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 21:50:56 +0400 |
| commit | f8d613e2a665bf1be9628a3c3f9bafe7599b32c0 (patch) | |
| tree | 98d4da8d0e1a5fb1d9064626b4b96d95ccf26375 /arch/s390/include/asm/emergency-restart.h | |
| parent | 8a0599dd2471f2a2e409498c08a0ab339057ad06 (diff) | |
| parent | 5bc20fc59706214d9591c11e1938a629d3538c12 (diff) | |
| download | linux-f8d613e2a665bf1be9628a3c3f9bafe7599b32c0.tar.xz | |
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
Diffstat (limited to 'arch/s390/include/asm/emergency-restart.h')
0 files changed, 0 insertions, 0 deletions