From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Sep 2012 01:37:16 +0000 (-0700)
Subject: Merge tag 'upstream-3.6-rc5' of git://git.infradead.org/linux-ubi
X-Git-Tag: Ubuntu-5.2.0-15.16~17322
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=50234c58d3cac9708e39e9238afcd5c68b694971;p=mirror_ubuntu-eoan-kernel.git

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
---

50234c58d3cac9708e39e9238afcd5c68b694971