summaryrefslogtreecommitdiff
path: root/block/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-31 06:25:37 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-31 06:25:37 -1000
commit6581058f44533f9d45548bcfe986c125376859e9 (patch)
treea5c811ace1fea5bccfbc5146048b5d2b3655bdcf /block/Makefile
parentfa9d594c46679485c5e3642d2bd9e874a7e07b19 (diff)
parenteacbbae385bf492229e84024863960d3160547c7 (diff)
downloadlinux-3.10-6581058f44533f9d45548bcfe986c125376859e9.tar.gz
linux-3.10-6581058f44533f9d45548bcfe986c125376859e9.tar.bz2
linux-3.10-6581058f44533f9d45548bcfe986c125376859e9.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'block/Makefile')
0 files changed, 0 insertions, 0 deletions