Merge branch 'topic/core-cleanup' into for-linus

author Takashi Iwai <tiwai@suse.de>

Thu, 20 May 2010 09:58:57 +0000 (11:58 +0200)

committer Takashi Iwai <tiwai@suse.de>

Thu, 20 May 2010 09:58:57 +0000 (11:58 +0200)
author Takashi Iwai <tiwai@suse.de>
Thu, 20 May 2010 09:58:57 +0000 (11:58 +0200)
committer Takashi Iwai <tiwai@suse.de>
Thu, 20 May 2010 09:58:57 +0000 (11:58 +0200)
diff --cc sound/core/pcm_native.c
Simple merge
diff --cc sound/core/timer.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Thu, 20 May 2010 09:58:57 +0000 (11:58 +0200)
committer	Takashi Iwai <tiwai@suse.de>
	Thu, 20 May 2010 09:58:57 +0000 (11:58 +0200)
		1	2
sound/core/pcm_native.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/core/timer.c	patch \|	diff1 \|	diff2 \|	blob \| history