diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-07-25 18:01:14 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-07-25 18:01:14 +0300 |
| commit | cf81d6b583444cb6f5e656f050e43413b236354e (patch) | |
| tree | 646567ef019e0bbc5cc9db0e26c464a9fc239481 /Documentation/CodeOfConflict | |
| parent | 76df52969711ae3725a98f26fbbc6a349803dcbf (diff) | |
| parent | 275353bb684ecfeb42f7a353fead81d43a01c519 (diff) | |
| download | linux-cf81d6b583444cb6f5e656f050e43413b236354e.tar.xz | |
Merge branch 'for-next' into for-linus
Merged 4.8 changes.
Diffstat (limited to 'Documentation/CodeOfConflict')
0 files changed, 0 insertions, 0 deletions