summaryrefslogtreecommitdiff
path: root/fs/jbd
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-01 19:04:24 (GMT)
committerMark Brown <broonie@linaro.org>2014-06-01 19:04:24 (GMT)
commit15f78ea67fa712392daebc262821d9fe29705cfa (patch)
tree43c5e59d4d7718cfa91f2833cbbb262de6e47a6c /fs/jbd
parent57f174f47e73b4e6f325c9374c17f5fe1602e496 (diff)
parent8c32570441f92244848c5e87f5d613465650aeee (diff)
parentc1406846e4e1ae92c4fb96fcb4532a63a2bceb21 (diff)
downloadlinux-15f78ea67fa712392daebc262821d9fe29705cfa.tar.xz
Merge branches 'topic/rt5640', 'topic/rt5645' and 'topic/rt5651' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rl6231