Merge tag 'upstream-3.6-rc5' of git://git.infradead.org/linux-ubi
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Sep 2012 01:37:16 +0000 (18:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Sep 2012 01:37:16 +0000 (18:37 -0700)
commit50234c58d3cac9708e39e9238afcd5c68b694971
tree58fcf5be25972fa78a95e78cbfa2513b4a5932d1
parented6fe9d614fc1bca95eb8c0ccd0e92db00ef9d5d
parent78b495c39add820ab66ab897af9bd77a5f2e91f6
Merge tag 'upstream-3.6-rc5' of git://git.infradead.org/linux-ubi

Pull ubi fix from Artem Bityutskiy:
 "A single small fix for memory deallocation: we allocated memory using
  'kmem_cache_alloc()' but were freeing it using 'kfree()' in some
  cases.  Now we fix this by using 'kmem_cache_free()' instead."

* tag 'upstream-3.6-rc5' of git://git.infradead.org/linux-ubi:
  UBI: fix a horrible memory deallocation bug