Merge tag 'upstream-4.5-rc7' of git://git.infradead.org/linux-ubifs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Mar 2016 19:24:05 +0000 (11:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Mar 2016 19:24:05 +0000 (11:24 -0800)
Pull UBI fix from Richard Weinberger:
 "This contains a single bug fix for UBI"

* tag 'upstream-4.5-rc7' of git://git.infradead.org/linux-ubifs:
  ubi: Fix out of bounds write in volume update code


Trivial merge