diff options
| author | Takashi Iwai <[email protected]> | 2017-10-17 08:50:59 +0000 |
|---|---|---|
| committer | Takashi Iwai <[email protected]> | 2017-10-17 08:52:06 +0000 |
| commit | 0011a33f097dd97d09a1ebd32c5d8df0be7ac04a (patch) | |
| tree | 706b30408893852c5d2f8ef3317ab17d407dcdea /net/unix/af_unix.c | |
| parent | ALSA: 6fire: remove unused variable card (diff) | |
| parent | ALSA: caiaq: Fix stray URB at probe error path (diff) | |
| download | kernel-0011a33f097dd97d09a1ebd32c5d8df0be7ac04a.tar.gz kernel-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 <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions