From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757703Ab1LNR10 (ORCPT ); Wed, 14 Dec 2011 12:27:26 -0500 Received: from gir.skynet.ie ([193.1.99.77]:44060 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755200Ab1LNR1X (ORCPT ); Wed, 14 Dec 2011 12:27:23 -0500 Date: Wed, 14 Dec 2011 17:27:15 +0000 (GMT) From: Dave Airlie X-X-Sender: airlied@skynet.skynet.ie To: torvalds@linux-foundation.org, keithp@keithp.com cc: DRI mailing list , linux-kernel@vger.kernel.org Subject: [git pull] drm fixes Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, simple one just one pci ids patch from Alex, I know Keith has some patches outstanding in his queue and I know they are probably more than you'll want to merge at this point, I'm off until next week, so Keith if you do send a pull request you may as well send to Linus, since I know Linus can be more lenient on pulls which make the hw he uses suck less :-) The following changes since commit 45e713efe2fa574b6662e7fb63fae9497c5e03d4: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2011-12-05 16:54:15 -0800) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes Alex Deucher (1): drm/radeon/kms: fix return type for radeon_encoder_get_dp_bridge_encoder_id Daniel Vetter (1): drm/i915: fix infinite recursion on unbind due to ilk vt-d w/a Thomas Meyer (1): vmwgfx: Use kcalloc instead of kzalloc to allocate array drivers/gpu/drm/i915/i915_gem.c | 7 ++++++- drivers/gpu/drm/radeon/radeon_encoders.c | 7 +++---- drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: [git pull] drm fixes Date: Wed, 14 Dec 2011 17:27:15 +0000 (GMT) Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from gir.skynet.ie (gir.skynet.ie [193.1.99.77]) by gabe.freedesktop.org (Postfix) with ESMTP id E34F39E970 for ; Wed, 14 Dec 2011 09:27:22 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: torvalds@linux-foundation.org, keithp@keithp.com Cc: linux-kernel@vger.kernel.org, DRI mailing list List-Id: dri-devel@lists.freedesktop.org Hi Linus, simple one just one pci ids patch from Alex, I know Keith has some patches outstanding in his queue and I know they are probably more than you'll want to merge at this point, I'm off until next week, so Keith if you do send a pull request you may as well send to Linus, since I know Linus can be more lenient on pulls which make the hw he uses suck less :-) The following changes since commit 45e713efe2fa574b6662e7fb63fae9497c5e03d4: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2011-12-05 16:54:15 -0800) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes Alex Deucher (1): drm/radeon/kms: fix return type for radeon_encoder_get_dp_bridge_encoder_id Daniel Vetter (1): drm/i915: fix infinite recursion on unbind due to ilk vt-d w/a Thomas Meyer (1): vmwgfx: Use kcalloc instead of kzalloc to allocate array drivers/gpu/drm/i915/i915_gem.c | 7 ++++++- drivers/gpu/drm/radeon/radeon_encoders.c | 7 +++---- drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-)