Merge remote branch 'origin/master' into nvc0-new

Conflicts:
	src/gallium/drivers/nouveau/nouveau_winsys.h

diff --cc src/gallium/drivers/nouveau/nouveau_winsys.h
index e7acbe6c3d30d4d17edd1422b02dee2e19a742ac,747b084bc45232cb5d0f06c2af9bb800aa2afdc0..8dfb84a596f55751a21d56a73c7134f43a16f468
--- 1/src/gallium/drivers/nouveau/nouveau_winsys.h
--- 2/src/gallium/drivers/nouveau/nouveau_winsys.h
+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
@@@ -10,9 -10,7 +10,9 @@@
  #include "nouveau/nouveau_grobj.h"
  #include "nouveau/nouveau_notifier.h"
  #include "nouveau/nouveau_resource.h"
- #include "nouveau/nouveau_pushbuf.h"
 +#ifndef NOUVEAU_NVC0
+ #include "nouveau/nv04_pushbuf.h"
 +#endif
  
  #ifndef NV04_PFIFO_MAX_PACKET_LEN
  #define NV04_PFIFO_MAX_PACKET_LEN 2047