tree f714c8d8db528274de2da4f8aa64b69af0d2aa5e
parent 49d41bae46f15da528ef9848fd7c9d38582aa8e9
parent e57e0d8e818512047fe379157c3f77f1b9fabffb
author Linus Torvalds <torvalds@linux-foundation.org> 1326236239 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326236239 -0800

Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

* 'linux-next' of git://git.infradead.org/ubifs-2.6:
  UBI: fix use-after-free on error path
  UBI: fix missing scrub when there is a bit-flip
  UBIFS: Use kmemdup rather than duplicating its implementation