commit | 57db53b07429c0d648f48727dd6c7c2b64c5708d | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 29 11:13:22 2011 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 29 11:13:22 2011 -0800 |
tree | b6dcc299de4e3ab26d9acf5ec4b572789eb38cda | |
parent | 883381d9f1c5a6329bbb796e23ae52c939940310 [diff] | |
parent | bc6697d8a506dedf09e8e9974ffa3a316183e608 [diff] |
Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux * 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux: slub: avoid potential NULL dereference or corruption slub: use irqsafe_cpu_cmpxchg for put_cpu_partial slub: move discard_slab out of node lock slub: use correct parameter to add a page to partial list tail