summaryrefslogtreecommitdiff
path: root/sound/oss/audio.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/oss/audio.c')
0 files changed, 0 insertions, 0 deletions
e8e91430d22e7c (diff)parent231e97e2b8ec9a1556ced5d8a89cda03a480b179 (diff)
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton: "4 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mem-hotplug: use nodes that contain memory as mask in new_node_page() scripts/recordmcount.c: account for .softirqentry.text dma-mapping.h: preserve unmap info for CONFIG_DMA_API_DEBUG mm,ksm: fix endless looping in allocating memory when ksm enable
Diffstat (limited to 'include/uapi')