]> git.proxmox.com Git - mirror_linux-firmware.git/commit
projects / mirror_linux-firmware.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6964030) | patch
Remove patch conflict remains
authorAlexandre Courbot <acourbot@nvidia.com>
Thu, 16 Jul 2015 06:57:58 +0000 (15:57 +0900)
committerAlexandre Courbot <acourbot@nvidia.com>
Thu, 16 Jul 2015 06:59:02 +0000 (15:59 +0900)
commitf6e3c833f319c87356728dd8016b3377e18e40c0
treef741025de737f62bb0736c7f98426420c4e7edfctree
parent696403047a940c425c93cb8da1efcec6ffda0b6ecommit | diff
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>
WHENCE diff | blob | blame | history
linux-firmware mirror