diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2015-07-16 15:57:58 +0900 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2015-07-16 15:59:02 +0900 |
| commit | f6e3c833f319c87356728dd8016b3377e18e40c0 (patch) | |
| tree | f741025de737f62bb0736c7f98426420c4e7edfc /nvidia | |
| parent | 696403047a940c425c93cb8da1efcec6ffda0b6e (diff) | |
| download | linux-firmware-f6e3c833f319c87356728dd8016b3377e18e40c0.tar.gz | |
Remove patch conflict remains
Two "<<<<<<< HEAD" lines remained from what seems to be a previous patch
conflict.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Diffstat (limited to 'nvidia')
0 files changed, 0 insertions, 0 deletions