projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 49d776f d1d0b6b)
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)
commit85c24cd8d3676cbae9e8809e894e68025c6d497e
tree024c4b655c1a8e6943ed8e75b64be38980508cfetree | snapshot
parent49d776ffb50f2e428aafb6a6576e58e80f1e886ccommit | diff
parentd1d0b6b668818571122d30d68a0b3f768bd83a52commit | diff
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 diff1 | diff2 | blob | history
sound/firewire/bebob/bebob_focusrite.c diff1 | diff2 | blob | history
sound/firewire/bebob/bebob_terratec.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.