From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 2 Feb 2014 19:30:08 +0000 (-0800)
Subject: Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7b383bef25e493cc4f047e44ebd6c3ccfd6d1cc5;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'slab/next' of git://git./linux/kernel/git/penberg/linux

Pull SLAB changes from Pekka Enberg:
 "Random bug fixes that have accumulated in my inbox over the past few
  months"

* 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
  mm: Fix warning on make htmldocs caused by slab.c
  mm: slub: work around unneeded lockdep warning
  mm: sl[uo]b: fix misleading comments
  slub: Fix possible format string bug.
  slub: use lockdep_assert_held
  slub: Fix calculation of cpu slabs
  slab.h: remove duplicate kmalloc declaration and fix kernel-doc warnings
---

7b383bef25e493cc4f047e44ebd6c3ccfd6d1cc5