From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Date: Mon, 17 Aug 2015 13:23:27 +1000 Message-ID: <20150817132327.7637ec22@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: Dave Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: Jani Nikula , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-next.vger.kernel.org SGkgRGF2ZSwKClRvZGF5J3MgbGludXgtbmV4dCBtZXJnZSBvZiB0aGUgZHJtIHRyZWUgZ290IGEg Y29uZmxpY3QgaW46CgogIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jCiAgZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCgpiZXR3ZWVuIGNvbW1pdHM6CgogIGYw ZmRjNTVkYjBjNiAoImRybS9pOTE1OiBjYWxjdWxhdGUgcHJpbWFyeSB2aXNpYmlsaXR5IGNoYW5n ZXMgaW5zdGVhZCBvZiBjYWxsaW5nIGZyb20gc2V0X2NvbmZpZyIpCiAgZDI5NDRjZjIxMzA1ICgi ZHJtL2k5MTU6IENvbW1pdCBwbGFuZXMgb24gZWFjaCBjcnRjIHNlcGFyYXRlbHkuIikKCmZyb20g dGhlIGRybS1pbnRlbC1maXhlcyB0cmVlIGFuZCBjb21taXQ6CgogIDc0YzA5MGIxYmRjNSAoImRy bS9pOTE1OiBVc2UgZnVsbCBhdG9taWMgbW9kZXNldC4iKQoKYW5kIG1heWJlIG90aGVycyBmcm9t IHRoZSBkcm0gdHJlZS4KCkkgZml4ZWQgaXQgdXAgKGJvdGggdGhlc2UgZm9ybWVyIGNvbW1pdHMg YXJlIGJhc2VkIG9uIGNvbW1pdHMgaW4gdGhlCmxhdHRlciB0cmVlLCBzbyBJIGp1c3QgdXNlZCB0 aGUgbGF0dGVyIHRyZWUgdmVyc2lvbnMpIGFuZCBjYW4gY2FycnkgdGhlCmZpeCBhcyBuZWNlc3Nh cnkgKG5vIGFjdGlvbiBpcyByZXF1aXJlZCkuCgotLSAKQ2hlZXJzLApTdGVwaGVuIFJvdGh3ZWxs ICAgICAgICAgICAgICAgICAgICBzZnJAY2FuYi5hdXVnLm9yZy5hdQpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=