Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 19 Sep 2007 18:39:10 +0000 (11:39 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 19 Sep 2007 18:39:10 +0000 (11:39 -0700)
commitd56c5c414c240f51213c11b3656001b5a3d4b499
treeea4c56bf283921a08decb75ebc79eb245dece4aa
parentf15f41383d466860f8b22f669da8c841f8d73c3b
parent588a33556ccf3e2135c7b4527557616f72fc144c
Merge /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