Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes

Just one fix for a stupid thinko in a DP training pattern commit.

* 'linux-4.7' of git://github.com/skeggsb/linux:
  drm/nouveau/disp/sor/gf119: select correct sor when poking training pattern

1 files changed, 1 insertions, 1 deletions

diff --git a/doc/llmnr-query.1 b/doc/llmnr-query.1
index f4a977b..b7eea3b 100644
--- a/doc/llmnr-query.1
+++ b/doc/llmnr-query.1
@@ -27,7 +27,7 @@ Set time to wait for reply in milliseconds (default: 1000).
 Set query type. Must be one of A, AAAA, ANY (default: ANY).
 .TP
 .B -6, --ipv6
-End queries over IPv6.
+Send queries over IPv6.
 .TP
 .B -h, --help
 Show usage information.