summaryrefslogtreecommitdiff
path: root/fs/sysv
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-03-07 16:18:08 +0000
committerMark Brown <broonie@kernel.org>2015-03-07 16:18:08 +0000
commit7d720ee52598b49ad70a2572fa159467c5f45dc4 (patch)
treeec90c205fde7f42c639b0768ce1dc3157368e061 /fs/sysv
parent13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff)
parent09cadf6e088b59c335116bf0e2667486bc126c6a (diff)
parent328f494d95aac8bd4896aea2328bc281053bcb71 (diff)
parent4ceba98d3fe204c59e5f63c4d834b45dcfe789f0 (diff)
Merge remote-tracking branches 'regmap/fix/irq', 'regmap/fix/rbtree' and 'regmap/fix/sync' into regmap-linus