diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 15:04:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 15:04:26 -0700 |
| commit | 0c9aac08261512d70d7d4817bd222abca8b6bdd6 (patch) | |
| tree | 41bbfed632bfc6233eac3e936cfdce75c5bd3a8f /drivers/char/lp.c | |
| parent | ed0bb8ea059764c3fc882fb135473afd347335e9 (diff) | |
| parent | 8bdec192b40cf7f7eec170b317c76089eb5eeddb (diff) | |
Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
Pull SLAB changes from Pekka Enberg:
"There's the new kmalloc_array() API, minor fixes and performance
improvements, but quite honestly, nothing terribly exciting."
* 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
mm: SLAB Out-of-memory diagnostics
slab: introduce kmalloc_array()
slub: per cpu partial statistics change
slub: include include for prefetch
slub: Do not hold slub_lock when calling sysfs_slab_add()
slub: prefetch next freelist pointer in slab_alloc()
slab, cleanup: remove unneeded return
Diffstat (limited to 'drivers/char/lp.c')
0 files changed, 0 insertions, 0 deletions