From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 1 Nov 2006 05:17:23 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v3.12-rc1~31920^2~20^2~254
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=30574b61611ccd29677989097f8c8a5d9a73d873;p=kernel%2Fkernel-generic.git

Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] ata_piix: allow 01b MAP for both ICH6M and ICH7M
  [PATCH] libata: unexport ata_dev_revalidate()
  [PATCH] Add 0x7110 piix to ata_piix.c
  [PATCH] sata_sis: fix flags handling for the secondary port
---

30574b61611ccd29677989097f8c8a5d9a73d873