Dave Airlie bdcddf95e8 Linux 4.1-rc4
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJVWh3TAAoJEHm+PkMAQRiG/kwH/2c9irodp2+M9OUnX2bfsBb6
 LnChiDpvkF5BB8jhP6d/XmvPp4NJzAbTxByhjdfb2E2HkorCUHCOIn2tI1TE2pUs
 2qjkOVH+XCzoV0goGtQjzK1ht8f2IrtlDiEjyRekK5cJHzhggb22QPtWL4npyd0O
 reDmG2jsRaF9POr9uLSFEv4CEnkksmRLUU0vuQX0TZeCJ41O7TXrkN/wKrLZ5mj4
 IWpqXQaSlrffq/T5HnVbXBxk3/T8QmhrIoppiMpV1mUVj0uTqlFRNi5qwT2Nit1h
 FVljWI4+WgOk3bf7fUlp+ahopjkTgu+GuXkiRP/pdgWNQO0cxCWSAzSndAlIIAE=
 =uOoJ
 -----END PGP SIGNATURE-----

Backmerge v4.1-rc4 into into drm-next

We picked up a silent conflict in amdkfd with drm-fixes and drm-next,
backmerge v4.1-rc5 and fix the conflicts

Signed-off-by: Dave Airlie <airlied@redhat.com>

Conflicts:
	drivers/gpu/drm/drm_irq.c
2015-05-20 16:23:53 +10:00
..
2014-10-20 10:30:15 +08:00
2014-09-23 23:15:46 -07:00
2015-02-14 17:05:03 +00:00
2015-04-21 16:16:02 -04:00
2015-02-23 09:59:07 -06:00
2014-12-19 12:57:45 -08:00
2013-04-26 16:08:16 +10:00
2014-07-01 10:48:05 -06:00
2014-03-20 14:55:18 +01:00
2015-03-06 21:50:02 -05:00
2014-11-19 14:48:02 -06:00
2014-12-08 12:55:57 +08:00
2012-10-16 18:49:15 -07:00
2014-08-08 15:57:31 -07:00
2015-04-12 21:25:13 -04:00
2014-05-14 10:04:34 +01:00
2013-12-11 12:57:55 -08:00
2013-08-13 15:10:22 -07:00
2014-12-16 11:19:42 -05:00
2014-12-22 16:12:36 -05:00
2015-01-05 22:44:46 -05:00
2015-02-09 16:59:03 +09:00
2014-12-02 13:52:53 -07:00
2015-02-17 14:34:51 -08:00
2015-02-03 12:48:40 -05:00
2014-08-08 15:57:31 -07:00
2013-11-27 11:03:38 -08:00
2015-01-20 13:51:06 +01:00
2014-12-13 12:42:52 -08:00
2013-02-27 19:10:22 -08:00
2015-02-02 18:46:51 -08:00
2013-04-19 14:57:57 -04:00
2015-04-23 15:16:14 -04:00
2012-11-16 10:15:35 -08:00
2014-03-21 14:21:13 -04:00
2015-04-07 17:29:41 -04:00
2015-02-07 18:43:16 +08:00
2014-12-10 17:41:10 -08:00
2015-04-29 17:10:38 -04:00
2014-12-09 14:10:41 +08:00
2013-03-22 16:19:59 -07:00
2015-03-05 22:08:42 -05:00
2014-04-26 12:13:24 -04:00
2013-05-02 13:40:15 +03:00
2015-03-29 12:13:52 +10:30
2015-03-29 12:13:52 +10:30
2014-12-09 12:05:24 +02:00
2013-12-11 09:25:20 -02:00
2015-03-31 13:58:35 -04:00