summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-07 19:38:27 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-07 19:38:27 +0400
commit6948ec70355ae6cf6082519e3d76b280373dade1 (patch)
tree5fa9bba0397d70958ec58a5d547dc8f7f06b9f9d /sound
parentcc4fc29e59c386919a7674e203be7822dc968dc0 (diff)
parent18e5b539b451158be7aae6c390a20f0d3e5b9213 (diff)
downloadlinux-6948ec70355ae6cf6082519e3d76b280373dade1.tar.xz
Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
* 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc: nodemask: include slab.h from drivers/base/node.c
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions