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 /net/wireless | |
| parent | 60ed380eb84d8be64c1ec0f91f619536457d084e (diff) | |
| parent | b388e6a7a6ba988998ddd83919ae8d3debf1a13d (diff) | |
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 'net/wireless')
0 files changed, 0 insertions, 0 deletions