diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-31 12:33:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-31 12:33:09 +0200 |
| commit | 69dd89fd2b9406603d218cab8996cfb232d5b8b9 (patch) | |
| tree | 467a65877d0c550ae7c937bc658abd313958122f /fs/nfs/nfs4state.c | |
| parent | 8c1d843460f42417d6b9553147a1a04ca1470602 (diff) | |
| parent | c159a85013afbb8283f0c7272812952e04d5c3a1 (diff) | |
Merge tag 'asoc-v3.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linussound-3.15-rc1
ASoC: Final updates for v3.15 merge window
A few more updates from last week - use of the tdm_slot mapping from
Xiubo plus a few smaller fixes and cleanups.
Diffstat (limited to 'fs/nfs/nfs4state.c')
0 files changed, 0 insertions, 0 deletions