]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5b67885) | patch
dt-bindings: vendor-prefixes: fix bad merge
authorJohan Hovold <johan@kernel.org>
Wed, 4 Jul 2018 06:46:26 +0000 (08:46 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Jul 2018 14:48:15 +0000 (16:48 +0200)
commit0669954c81448b77b36ca07a08f1ba6c0e4def41
tree7ae06ed912bca284076ef7e616928d16a9b4a2dbtree | snapshot
parent5b67885ec311679bdb3f6ff8a2f6a3de0c45eaaccommit | diff
dt-bindings: vendor-prefixes: fix bad merge

Remove the vendor-prefix reject file which was accidentally added when
merging the gnss sirfstar binding. The wi2wi prefix had already been
added by commit 57cf71db9300e ("dt-bindings: define vendor prefix for
Wi2Wi, Inc.").

Fixes: 2580fffbf92b ("dt-bindings: gnss: add sirfstar binding")
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Documentation/devicetree/bindings/vendor-prefixes.txt.rej [deleted file] blob | history
Linux Kernel Source Tree.