diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-21 10:36:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-21 10:36:44 -0700 |
commit | c6ef814509fedb4ab4b5dc5bdca309d4e7181597 (patch) | |
tree | 292f0683b18526b60aeb4c3b94784d1f587a055d /drivers/ata | |
parent | Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux (diff) | |
parent | UBI: fix missing brace control flow (diff) | |
download | linux-dev-c6ef814509fedb4ab4b5dc5bdca309d4e7181597.tar.xz linux-dev-c6ef814509fedb4ab4b5dc5bdca309d4e7181597.zip |
Merge tag 'upstream-4.0-rc5' of git://git.infradead.org/linux-ubifs
Pull UBI fix from Artem Bityutskiy:
"This fixes a bug introduced during the v4.0 merge window where we
forgot to put braces where they should be"
* tag 'upstream-4.0-rc5' of git://git.infradead.org/linux-ubifs:
UBI: fix missing brace control flow
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions