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: Thu, 8 Sep 2016 12:08:40 +1000 Message-ID: <20160908120840.52c68ca4@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 Graphics , DRI Cc: Jani Nikula , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-next.vger.kernel.org SGkgYWxsLAoKVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRoZSBkcm0taW50ZWwgdHJlZSBn b3QgYSBjb25mbGljdCBpbjoKCiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwoKYmV0 d2VlbiBjb21taXQ6CgogIDk5MDkxMTNjYzQ4YSAoImRybS9pOTE1L2dlbjk6IE9ubHkgY29weSBX TSByZXN1bHRzIGZvciBjaGFuZ2VkIHBpcGVzIHRvIHNrbF9odyIpCgpmcm9tIExpbnVzJyB0cmVl IGFuZCBjb21taXRzOgoKICAyNzIyZWZiOTBiMzQgKCJkcm0vaTkxNS9nZW45OiBPbmx5IGNvcHkg V00gcmVzdWx0cyBmb3IgY2hhbmdlZCBwaXBlcyB0byBza2xfaHciKQogIDI3MDgyNDkzZTljNiAo ImRybS9pOTE1L3NrbDogVXBkYXRlIEREQiB2YWx1ZXMgYXRvbWljYWxseSB3aXRoIHdtcy9wbGFu ZSBhdHRycyIpCgpmcm9tIHRoZSBkcm0taW50ZWwgdHJlZS4KCkkgZml4ZWQgaXQgdXAgKEkganVz dCB1c2VkIHRoZSBkcm0taW50ZWwgdHJlZSB2ZXJzaW9uKSBhbmQgY2FuIGNhcnJ5IHRoZQpmaXgg YXMgbmVjZXNzYXJ5LiBUaGlzIGlzIG5vdyBmaXhlZCBhcyBmYXIgYXMgbGludXgtbmV4dCBpcyBj b25jZXJuZWQsCmJ1dCBhbnkgbm9uIHRyaXZpYWwgY29uZmxpY3RzIHNob3VsZCBiZSBtZW50aW9u ZWQgdG8geW91ciB1cHN0cmVhbQptYWludGFpbmVyIHdoZW4geW91ciB0cmVlIGlzIHN1Ym1pdHRl ZCBmb3IgbWVyZ2luZy4gIFlvdSBtYXkgYWxzbyB3YW50CnRvIGNvbnNpZGVyIGNvb3BlcmF0aW5n IHdpdGggdGhlIG1haW50YWluZXIgb2YgdGhlIGNvbmZsaWN0aW5nIHRyZWUgdG8KbWluaW1pc2Ug YW55IHBhcnRpY3VsYXJseSBjb21wbGV4IGNvbmZsaWN0cy4KCi0tIApDaGVlcnMsClN0ZXBoZW4g Um90aHdlbGwKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==