| commit | 85c24cd8d3676cbae9e8809e894e68025c6d497e | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Mon Oct 27 14:11:07 2014 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Mon Oct 27 14:11:07 2014 +0100 |
| tree | 024c4b655c1a8e6943ed8e75b64be38980508cfe | |
| parent | 49d776ffb50f2e428aafb6a6576e58e80f1e886c [diff] | |
| parent | d1d0b6b668818571122d30d68a0b3f768bd83a52 [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