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 the
 drm-intel-fixes tree
Date: Wed, 24 Aug 2016 11:32:26 +1000
Message-ID: <20160824113226.3fbcc285@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 Graphics <intel-gfx@lists.freedesktop.org>, DRI <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
b3QgYSBjb25mbGljdCBpbjoKCiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKCmJl
dHdlZW4gY29tbWl0OgoKICBmNDAzMzcyNjU4ZmMgKCJkcm0vaTkxNS9za2w6IEFkZCBzdXBwb3J0
IGZvciB0aGUgU0FHViwgZml4IHVuZGVycnVuIGhhbmdzIikKICAod2hpY2ggaXMgYSBjaGVyeS1w
aWNrIG9mIGNvbW1pdCA2NTZkMWI4OWU1ZmYgZnJvbSB0aGUgZHJtLWludGVsIHRyZWUpCgpmcm9t
IHRoZSBkcm0taW50ZWwtZml4ZXMgdHJlZSBhbmQgY29tbWl0OgoKICA2MmUwZmI4ODAxMjMgKCJk
cm0vaTkxNS9za2w6IFVwZGF0ZSBwbGFuZSB3YXRlcm1hcmtzIGF0b21pY2FsbHkgZHVyaW5nIHBs
YW5lIHVwZGF0ZXMiKQoKZnJvbSB0aGUgZHJtLWludGVsIHRyZWUuCgpJIGZpeGVkIGl0IHVwIChJ
IGp1c3QgdXNlZCB0aGUgZHJtLWludGVsIHRyZWUgdmVyc2lvbikgYW5kIGNhbiBjYXJyeSB0aGUK
Zml4IGFzIG5lY2Vzc2FyeS4gVGhpcyBpcyBub3cgZml4ZWQgYXMgZmFyIGFzIGxpbnV4LW5leHQg
aXMgY29uY2VybmVkLApidXQgYW55IG5vbiB0cml2aWFsIGNvbmZsaWN0cyBzaG91bGQgYmUgbWVu
dGlvbmVkIHRvIHlvdXIgdXBzdHJlYW0KbWFpbnRhaW5lciB3aGVuIHlvdXIgdHJlZSBpcyBzdWJt
aXR0ZWQgZm9yIG1lcmdpbmcuICBZb3UgbWF5IGFsc28gd2FudAp0byBjb25zaWRlciBjb29wZXJh
dGluZyB3aXRoIHRoZSBtYWludGFpbmVyIG9mIHRoZSBjb25mbGljdGluZyB0cmVlIHRvCm1pbmlt
aXNlIGFueSBwYXJ0aWN1bGFybHkgY29tcGxleCBjb25mbGljdHMuCgotLSAKQ2hlZXJzLApTdGVw
aGVuIFJvdGh3ZWxsCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y
ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm
eAo=