Merge with mainline

author Tony Lindgren <tony@atomide.com>

Mon, 6 Jun 2005 16:20:17 +0000 (09:20 -0700)

committer Tony Lindgren <tony@atomide.com>

Mon, 6 Jun 2005 16:20:17 +0000 (09:20 -0700)
author Tony Lindgren <tony@atomide.com>
Mon, 6 Jun 2005 16:20:17 +0000 (09:20 -0700)
committer Tony Lindgren <tony@atomide.com>
Mon, 6 Jun 2005 16:20:17 +0000 (09:20 -0700)
diff --cc Makefile
Simple merge
diff --cc sound/oss/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Mon, 6 Jun 2005 16:20:17 +0000 (09:20 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Mon, 6 Jun 2005 16:20:17 +0000 (09:20 -0700)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
sound/oss/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history