David S. Miller 56c5d900db Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	sound/core/memalloc.c

2008-10-11 12:39:35 -07:00

..

alsa-driver-api.tmpl

remove mention of CONFIG_KMOD from documentation

2008-07-22 19:24:29 +10:00

writing-an-alsa-driver.tmpl

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-10-11 12:39:35 -07:00