]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 27 Oct 2014 13:11:07 +0000 (14:11 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 27 Oct 2014 13:11:07 +0000 (14:11 +0100)
commit1ccfc570ba541a1fb417b74775fe3004cc2b2d8b
tree024c4b655c1a8e6943ed8e75b64be38980508cfe
parente74072cc646aa2078ee26bdee875f4ec1d9cf4e8
parent3856c14d151776da9055b082bc859ab31b81c697
Merge branch 'for-linus' into for-next

Merged upstream branch to make further fireworks development easier
(and avoid conflicts earlier).

Conflicts:
sound/firewire/bebob/bebob_focusrite.c
sound/core/pcm_native.c
sound/firewire/bebob/bebob_focusrite.c
sound/firewire/bebob/bebob_terratec.c