aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ubifs/commit.c
diff options
context:
space:
mode:
authorTakashi Iwai <[email protected]>2015-02-05 20:30:43 +0000
committerTakashi Iwai <[email protected]>2015-02-05 20:30:43 +0000
commitdeb08737e7ad6545e0fe19263f9221ecfdcfdd9f (patch)
tree673ffdfdea886aabe1169db0d2284eb7178fce0e /fs/ubifs/commit.c
parentMerge tag 'asoc-fix-v3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
parentASoC: Intel: fix sst firmware path for cht-bsw-rt5672 (diff)
downloadkernel-deb08737e7ad6545e0fe19263f9221ecfdcfdd9f.tar.gz
kernel-deb08737e7ad6545e0fe19263f9221ecfdcfdd9f.zip
Merge tag 'asoc-fix-intel-v3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fix for Intel firmware name Another one liner that arrived after the earlier pull request. There's a trivial conflict with my -next branch, I'll send a pull request with that resolution and some other new stuff before Monday.
Diffstat (limited to 'fs/ubifs/commit.c')
0 files changed, 0 insertions, 0 deletions