summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-21 19:39:53 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-21 19:39:53 (GMT)
commitf6f0a6d6a7258eff41fd202fc70df18271a2de79 (patch)
treea32040d8cc6e06e056e184e35ed4729e28a244d8 /drivers/block
parent2017bd19454ea7cdae19922d15b6930f6c8088a2 (diff)
parent33027af637da3f69bd17488cc3e68493c9052a7d (diff)
downloadlinux-f6f0a6d6a7258eff41fd202fc70df18271a2de79.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (22 commits) GFS2: fixed typo GFS2: Fix type mapping for demote_rq interface GFS2 fatal: filesystem consistency error on rename GFS2: Improve journal allocation via sysfs GFS2: Add "norecovery" mount option as a synonym for "spectator" GFS2: Fix spectator umount issue GFS2: Fix compiler warning from previous patch GFS2: reserve more blocks for transactions GFS2: Fix journal check for spectator mounts GFS2: Remove upgrade mount option GFS2: Remove localcaching mount option GFS2: Remove ignore_local_fs mount argument GFS2: Make . and .. qstrs constant GFS2: Use new workqueue scheme GFS2: Update handling of DLM return codes to match reality GFS2: Don't enforce min hold time when two demotes occur in rapid succession GFS2: Fix whitespace in previous patch GFS2: fallocate support GFS2: Add a bug trap in allocation code GFS2: No longer experimental ...
Diffstat (limited to 'drivers/block')
0 files changed, 0 insertions, 0 deletions