]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'topic/misc' into topic/pcsp-fix
authorTakashi Iwai <tiwai@suse.de>
Wed, 26 Nov 2008 13:12:42 +0000 (14:12 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 26 Nov 2008 13:12:42 +0000 (14:12 +0100)
commit08882bfc6690349b306a6068c2c1e3e9f825764e
tree0db15820fdd391a1570e1257167e8f02532c83f5
parent6a7f399dc7dd413e6c12303f3fa8e11caf2c9817
parent42383a39601689207789e60a96f7431f96e0cc2a
Merge branch 'topic/misc' into topic/pcsp-fix

Conflicts:
sound/drivers/pcsp/pcsp_lib.c
include/sound/core.h
sound/drivers/pcsp/pcsp_lib.c