summaryrefslogtreecommitdiff
path: root/Documentation/logo.gif
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2018-07-04 09:46:26 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-07-06 17:48:15 +0300
commit36cb055f1bcfd10e4565867a696ff688d9de3cf4 (patch)
tree7ae06ed912bca284076ef7e616928d16a9b4a2db /Documentation/logo.gif
parentd5b9653dd2bb7a2b1c8cc783c5d3b607bbb6b271 (diff)
downloadlinux-36cb055f1bcfd10e4565867a696ff688d9de3cf4.tar.xz
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 a593bff82cae2 ("dt-bindings: define vendor prefix for Wi2Wi, Inc."). Fixes: 176193b7dd6e ("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>
Diffstat (limited to 'Documentation/logo.gif')
0 files changed, 0 insertions, 0 deletions