diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-10-17 10:50:59 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-10-17 10:52:06 +0200 |
commit | 0011a33f097dd97d09a1ebd32c5d8df0be7ac04a (patch) | |
tree | 706b30408893852c5d2f8ef3317ab17d407dcdea /README | |
parent | ALSA: 6fire: remove unused variable card (diff) | |
parent | ALSA: caiaq: Fix stray URB at probe error path (diff) | |
download | linux-0011a33f097dd97d09a1ebd32c5d8df0be7ac04a.tar.xz linux-0011a33f097dd97d09a1ebd32c5d8df0be7ac04a.zip |
Merge branch 'for-linus' into for-next
Back-merge for applying the timer API conversion patch for line6
driver that conflicts with the recent fix in upstream.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions