tree 43ccaec68cc3aa1b3903e2b4c970d31b8737d4ed
parent ea45d15394c57cb214aef8e6d40976c128995d43
parent 8588a2b732928b343233af9b1855705b8286bed4
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1193598194 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1193598194 -0700

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

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: add SH-S202J to ivb_list[]
  drivers/ide/pci/sc1200.c: fix suspend/resume buglets and warnings
  drivers/ide/pci/generic: fix build for CONFIG_HOTPLUG=n
  hpt366: fix build for CONFIG_HOTPLUG=n
  cy82c693: fix build for CONFIG_HOTPLUG=n