From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Date: Tue, 29 Sep 2015 11:20:29 +1000 Message-ID: <20150929112029.17251d75@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org SGkgYWxsLAoKVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRoZSBkcm0taW50ZWwgdHJlZSBn b3QgYSBjb25mbGljdCBpbjoKCiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CgpiZXR3ZWVuIGNvbW1pdDoKCiAgNzIxYTA5ZjczOTNkICgiZHJtL2k5MTU6IEFkZCBwcmltYXJ5 IHBsYW5lIHRvIG1hc2sgaWYgaXQncyB2aXNpYmxlIikKCmZyb20gTGludXMnIHRyZWUgYW5kIGNv bW1pdDoKCiAgYmQwMzM1YjI5OTAzICgiZHJtL2k5MTU6IEFkZCBwcmltYXJ5IHBsYW5lIHRvIG1h c2sgaWYgaXQncyB2aXNpYmxlIikKCmZyb20gdGhlIGRybS1pbnRlbCB0cmVlLgoKSSBmaXhlZCBp dCB1cCAoSSB1c2VkIHRoZSBkcm0taW50ZWwgdHJlZSB2ZXJzaW9uKSBhbmQgY2FuIGNhcnJ5IHRo ZSBmaXgKYXMgbmVjZXNzYXJ5IChubyBhY3Rpb24gaXMgcmVxdWlyZWQpLgoKLS0gCkNoZWVycywK U3RlcGhlbiBSb3Rod2VsbCAgICAgICAgICAgICAgICAgICAgc2ZyQGNhbmIuYXV1Zy5vcmcuYXUK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK