tree ea4c56bf283921a08decb75ebc79eb245dece4aa
parent f15f41383d466860f8b22f669da8c841f8d73c3b
parent 588a33556ccf3e2135c7b4527557616f72fc144c
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1190227150 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1190227150 -0700

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