Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 31 Jul 2011 16:25:37 +0000 (06:25 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 31 Jul 2011 16:25:37 +0000 (06:25 -1000)
commit6581058f44533f9d45548bcfe986c125376859e9
treea5c811ace1fea5bccfbc5146048b5d2b3655bdcf
parentfa9d594c46679485c5e3642d2bd9e874a7e07b19
parenteacbbae385bf492229e84024863960d3160547c7
Merge branch 'for-linus' of git://git./linux/kernel/git/penberg/slab-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  slab: use NUMA_NO_NODE
  slab: remove one NR_CPUS dependency