diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-22 17:37:47 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-22 17:37:47 +0100 |
| commit | 6ea9786e76d74350aee6cd9339c6f7cb765ba291 (patch) | |
| tree | a5ac36956a33cd1b2e349800333234876c311dc6 /arch/arm/mach-ux500/setup.h | |
| parent | Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/pen... (diff) | |
| parent | xfs: open code inc_inode_iversion when logging an inode (diff) | |
| download | linux-6ea9786e76d74350aee6cd9339c6f7cb765ba291.tar.xz linux-6ea9786e76d74350aee6cd9339c6f7cb765ba291.zip | |
Merge tag 'xfs-for-linus-v3.13-rc1-2' of git://oss.sgi.com/xfs/xfs
Pull second xfs update from Ben Myers:
"There are a couple of patches that I wasn't quite sure about in time
for our initial 3.13 pull request, a bugfix, and an update to add Dave
to MAINTAINERS:
Here we have a performance fix for inode iversion, increased inode
cluster size for v5 superblock filesystems, a fix for error handling
in xfs_bmap_add_attrfork, and a MAINTAINERS update to add Dave"
* tag 'xfs-for-linus-v3.13-rc1-2' of git://oss.sgi.com/xfs/xfs:
xfs: open code inc_inode_iversion when logging an inode
xfs: increase inode cluster size for v5 filesystems
xfs: fix unlock in xfs_bmap_add_attrfork
xfs: update maintainers
Diffstat (limited to 'arch/arm/mach-ux500/setup.h')
0 files changed, 0 insertions, 0 deletions