Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Jan 2012 22:57:19 +0000 (14:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Jan 2012 22:57:19 +0000 (14:57 -0800)
commit5c395ae7033099fc657114ea997858aa622f08b2
treef714c8d8db528274de2da4f8aa64b69af0d2aa5e
parent49d41bae46f15da528ef9848fd7c9d38582aa8e9
parente57e0d8e818512047fe379157c3f77f1b9fabffb
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