summaryrefslogtreecommitdiff
path: root/arch/mn10300
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-11 03:20:49 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-11 03:20:49 +0300
commitb2718bffb4088faf13092db30c1ebf088ddee52e (patch)
tree445160f6449c9639b0f0f1bf2cd0f59093f73602 /arch/mn10300
parentae90fb14206efda2c2ea6d61e14f14bf0132f676 (diff)
parent278702074ff77b1a3fa2061267997095959f5e2c (diff)
downloadlinux-b2718bffb4088faf13092db30c1ebf088ddee52e.tar.xz
Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw
Pull gfs2 updates from Steven Whitehouse: "This time we have mostly clean ups. There is a bug fix for a NULL dereference relating to ACLs, and another which improves (but does not fix entirely) an allocation fall-back code path. The other three patches are small clean ups" * tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw: GFS2: Fix crash during ACL deletion in acl max entry check in gfs2_set_acl() GFS2: use __vmalloc GFP_NOFS for fs-related allocations. GFS2: Eliminate a nonsense goto GFS2: fix sprintf format specifier GFS2: Eliminate __gfs2_glock_remove_from_lru
Diffstat (limited to 'arch/mn10300')
0 files changed, 0 insertions, 0 deletions