projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitc6ef814509fedb4ab4b5dc5bdca309d4e7181597
tree292f0683b18526b60aeb4c3b94784d1f587a055dtree | snapshot
parent60ed380eb84d8be64c1ec0f91f619536457d084ecommit | diff
parentb388e6a7a6ba988998ddd83919ae8d3debf1a13dcommit | 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
John Crispins staging tree