diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-06-15 13:15:48 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-06-15 13:15:48 +0200 |
| commit | 88f1236bfa9586ca458b67abde8ce91665bba079 (patch) | |
| tree | a34d33e43ad652532255dafeecc9b99f1ce40137 /fs/super.c | |
| parent | 70a3887a8d843b8485d90bea6733e53c4c076c41 (diff) | |
| parent | 8b99aba70c5f581860736855e211cf981f438ad2 (diff) | |
Merge branch 'for-linus' into for-next
Conflicts:
sound/pci/hda/patch_realtek.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'fs/super.c')
0 files changed, 0 insertions, 0 deletions