From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754952Ab1KRTrz (ORCPT ); Fri, 18 Nov 2011 14:47:55 -0500 Received: from shards.monkeyblade.net ([198.137.202.13]:54322 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752006Ab1KRTrx (ORCPT ); Fri, 18 Nov 2011 14:47:53 -0500 Date: Fri, 18 Nov 2011 14:47:48 -0500 (EST) Message-Id: <20111118.144748.2127699093460246796.davem@davemloft.net> To: torvalds@linux-foundation.org CC: akpm@linux-foundation.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT] IDE From: David Miller X-Mailer: Mew version 6.3 on Emacs 23.2 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (shards.monkeyblade.net [198.137.202.13]); Fri, 18 Nov 2011 11:47:51 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Just a few small bug fixes, including: 1) Mirror ICH7 MWDMA1 errata fix from libata, from Bartlomiej Zolnierkiewicz. 2) Triflex IDE should not be powered down on suspend, from Mikulas Patocka. Please pull, thanks! The following changes since commit b6844523839779030430ff28f036f83e2a3f43e6: Merge branch 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen (2011-11-18 13:18:07 -0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git master Bartlomiej Zolnierkiewicz (3): piix: ICH7 MWDMA1 errata icside: DMA support fix cy82c693: fix PCI device selection Mikulas Patocka (1): IDE: Don't powerdown Compaq Triflex IDE device on suspend drivers/ide/cy82c693.c | 6 +++--- drivers/ide/icside.c | 2 +- drivers/ide/piix.c | 18 ++++++++++-------- drivers/ide/triflex.c | 16 +++++++++++++++- 4 files changed, 29 insertions(+), 13 deletions(-)