From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree Date: Thu, 24 Sep 2015 11:25:16 +1000 Message-ID: <20150924112516.1dc9d5d3@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: dri-devel@lists.freedesktop.org SGkgYWxsLAoKVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRoZSBkcm0taW50ZWwgdHJlZSBn b3QgYSBjb25mbGljdCBpbjoKCiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CgpiZXR3ZWVuIGNvbW1pdDoKCiAgNzIxYTA5ZjczOTNkICgiZHJtL2k5MTU6IEFkZCBwcmltYXJ5 IHBsYW5lIHRvIG1hc2sgaWYgaXQncyB2aXNpYmxlIikKCmZyb20gdGhlIGRybS1pbnRlbC1maXhl cyB0cmVlIGFuZCBjb21taXQ6CgogIGY5Y2Q3Yjg4MWEwNCAoImRybS9pOTE1OiBNb3ZlIHNwcml0 ZS9jdXJzb3IgcGxhbmUgZGlzYWJsZSB0byBpbnRlbF9zYW5pdGl6ZV9jcnRjKCkiKQoKZnJvbSB0 aGUgZHJtLWludGVsIHRyZWUuCgpJIGZpeGVkIGl0IHVwIChJIGhhdmUgbm8gaWRlYSB3aGF0IGRv IHRvIGhlcmUsIHNvIEkganVzdCB1c2VkIHRoZSB2ZXJzaW9uCmZyb20gdGhlIGRybS1pbnRlbCB0 cmVlKSBhbmQgY2FuIGNhcnJ5IHRoZSBmaXggYXMgbmVjZXNzYXJ5IChubyBhY3Rpb24KaXMgcmVx dWlyZWQgLSB1bmxlc3MgdGhlcmUgaXMgYSBiZXR0ZXIgZml4KS4KCi0tIApDaGVlcnMsClN0ZXBo ZW4gUm90aHdlbGwgICAgICAgICAgICAgICAgICAgIHNmckBjYW5iLmF1dWcub3JnLmF1Cl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==