From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 19 Sep 2007 18:39:10 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.23-rc7~7
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d56c5c414c240f51213c11b3656001b5a3d4b499;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: remove unused variables from drivers/ide/ppc/pmac.c
  ide: ST320413A has the same problem as ST340823A
---

d56c5c414c240f51213c11b3656001b5a3d4b499