From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754667AbZEVGLo (ORCPT ); Fri, 22 May 2009 02:11:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751122AbZEVGLh (ORCPT ); Fri, 22 May 2009 02:11:37 -0400 Received: from gate.crashing.org ([63.228.1.57]:42883 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750880AbZEVGLg (ORCPT ); Fri, 22 May 2009 02:11:36 -0400 Subject: [git pull] Please pull powerpc.git merge branch From: Benjamin Herrenschmidt To: Linus Torvalds Cc: linuxppc-dev list , Andrew Morton , Linux Kernel list Content-Type: text/plain Date: Fri, 22 May 2009 16:11:26 +1000 Message-Id: <1242972686.26104.17.camel@pasglop> Mime-Version: 1.0 X-Mailer: Evolution 2.26.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus ! Here's a small fix for .30 that works around a regression caused by enabling MSI support in the IPR driver. Cheers, Ben. The following changes since commit 5805977e63a36ad56594a623f3bd2bebcb7db233: Linus Torvalds (1): Merge branch 'for-linus' of git://git.kernel.org/.../jbarnes/drm-2.6 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Michael Ellerman (1): powerpc/maple: Add a quirk to disable MSI for IPR on Bimini arch/powerpc/platforms/maple/pci.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)