projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60ed380 b388e6a)
Merge tag 'upstream-4.0-rc5' of git://git.infradead.org/linux-ubifs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Mar 2015 17:36:44 +0000 (10:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Mar 2015 17:36:44 +0000 (10:36 -0700)
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


Trivial merge