| commit | 49c4a4c5244d2c1a25ec1e01dbb4fba3813d237d | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Wed Apr 29 07:28:29 2015 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Wed Apr 29 07:28:29 2015 +0200 |
| tree | 76f7980c634307d13c548790446d159149822446 | |
| parent | 1962fcab4ee80e555bcc9d0f50e416800d474fa2 [diff] | |
| parent | 7241ea558c6715501e777396b5fc312c372e11d9 [diff] |
Merge branch 'for-linus' into for-next Conflicts: sound/pci/emu10k1/emu10k1_main.c Signed-off-by: Takashi Iwai <tiwai@suse.de>