aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds2013-04-05 12:22:02 -0700
committerLinus Torvalds2013-04-05 12:22:02 -0700
commit00fa6fe963a97cc95e80a39a34a790bdce06cb4c (patch)
treebe90848a4ecd4cef235123509417196fee202c70 /arch
parentff802e31b5e60a9a39f70479947a27cea5da701c (diff)
parentb2c87cae0edb1a99f7dd2751d5beb2cb97926514 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
Pull GFS2 fixes from Steven Whitehouse: "There are two patches which fix up a couple of minor issues in the DLM interface code, a missing error path in gfs2_rs_alloc(), one patch which fixes a problem during "withdraw" and a fix for discards/FITRIM when using 4k sector sized devices." * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes: GFS2: Issue discards in 512b sectors GFS2: Fix unlock of fcntl locks during withdrawn state GFS2: return error if malloc failed in gfs2_rs_alloc() GFS2: use memchr_inv GFS2: use kmalloc for lvb bitmap
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions