From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: manual merge of the drm-intel tree with
	Linus' tree
Date: Tue, 31 May 2016 11:00:19 +1000
Message-ID: <20160531110019.0758ead7@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Daniel Vetter <daniel.vetter@ffwll.ch>, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@intel.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
List-Id: linux-next.vger.kernel.org

SGkgYWxsLAoKVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRoZSBkcm0taW50ZWwgdHJlZSBn
b3QgYSBjb25mbGljdCBpbjoKCiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwoKYmV0
d2VlbiBjb21taXQ6CgogIDVmYmQwNDE4ZWVmMiAoImRybS9pOTE1OiBSZS1lbmFibGUgR0dUVCBl
YXJsaWVyIGR1cmluZyByZXN1bWUgb24gcHJlLWdlbjYgcGxhdGZvcm1zIikKKHdoaWNoIGFsc28g
ZXhpc3RzIGluIHRoZSBkcm0taW50ZWwgdHJlZSBhcyBjb21taXQgYWM4NDBhZTUzNTczKQoKZnJv
bSBMaW51cycgdHJlZSBhbmQgY29tbWl0OgoKICBkMjAwY2RhNmJkOWYgKCJkcm0vaTkxNTogUmVt
b3ZlIGVhcmx5IGwzLXJlbWFwIikKCmZyb20gdGhlIGRybS1pbnRlbCB0cmVlLgoKSSBmaXhlZCBp
dCB1cCAoSSB1c2VkIHRoZSBkcm0taW50ZWwgdHJlZSB2ZXJzaW9uKSBhbmQgY2FuIGNhcnJ5IHRo
ZSBmaXgKYXMgbmVjZXNzYXJ5LiBUaGlzIGlzIG5vdyBmaXhlZCBhcyBmYXIgYXMgbGludXgtbmV4
dCBpcyBjb25jZXJuZWQsIGJ1dAphbnkgbm9uIHRyaXZpYWwgY29uZmxpY3RzIHNob3VsZCBiZSBt
ZW50aW9uZWQgdG8geW91ciB1cHN0cmVhbSBtYWludGFpbmVyCndoZW4geW91ciB0cmVlIGlzIHN1
Ym1pdHRlZCBmb3IgbWVyZ2luZy4gIFlvdSBtYXkgYWxzbyB3YW50IHRvIGNvbnNpZGVyCmNvb3Bl
cmF0aW5nIHdpdGggdGhlIG1haW50YWluZXIgb2YgdGhlIGNvbmZsaWN0aW5nIHRyZWUgdG8gbWlu
aW1pc2UgYW55CnBhcnRpY3VsYXJseSBjb21wbGV4IGNvbmZsaWN0cy4KCi0tIApDaGVlcnMsClN0
ZXBoZW4gUm90aHdlbGwKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au
b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt
Z2Z4Cg==