proto/randrproto: Branch 'master'

[Dave Airlie]

 randrproto.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d501a4f08ee3c5435841aa70c0d5cd4b7398bd12
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Dec 12 15:57:40 2014 -0800

    Fix spelling errors in randrproto.txt
    
    Reviewed-by: Dave Airlie <airlied at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/randrproto.txt b/randrproto.txt
index 1900482..df2c712 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -149,7 +149,7 @@ be dynamically configured to provide support for:
 
  4) multiple GPU rendering - This replaces Xinerama.
 
-1.99 Acknowledgements
+1.99 Acknowledgments
 
 Our thanks to the contributors to the design found on the xpert mailing
 list, in particular:
@@ -262,7 +262,7 @@ RRCONFIGSTATUS { Success
 	configuration is unsupported by the hardware. The goal is to make
 	these limitations expressed by the protocol, but when that isn't
 	possible it is correct to return this error value. If, as a
-	implementor, you find this error code required, please submit the
+	implementer, you find this error code required, please submit the
 	hardware constraints that exist so that a future version of the
 	extension can correctly capture the configuration constraints in
 	your system.