projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed6fe9d 78b495c)
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)
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


Trivial merge
John Crispins staging tree