summaryrefslogtreecommitdiffstats
path: root/arch/parisc/include/asm/mmzone.h
diff options
context:
space:
mode:
authorLinus Torvalds2011-06-27 22:32:14 +0200
committerLinus Torvalds2011-06-27 22:32:14 +0200
commitaf4087e0e682df12bdffec5cfafc2fec9208716e (patch)
tree564622df71c8b5666be24cbfd93f58516791d180 /arch/parisc/include/asm/mmzone.h
parentMerge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff)
parentbtrfs: fix inconsonant inode information (diff)
downloadkernel-qcow2-linux-af4087e0e682df12bdffec5cfafc2fec9208716e.tar.gz
kernel-qcow2-linux-af4087e0e682df12bdffec5cfafc2fec9208716e.tar.xz
kernel-qcow2-linux-af4087e0e682df12bdffec5cfafc2fec9208716e.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: btrfs: fix inconsonant inode information Btrfs: make sure to update total_bitmaps when freeing cache V3 Btrfs: fix type mismatch in find_free_extent() Btrfs: make sure to record the transid in new inodes
Diffstat (limited to 'arch/parisc/include/asm/mmzone.h')
0 files changed, 0 insertions, 0 deletions