]> nv-tegra.nvidia Code Review - linux-3.10.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 28 Oct 2007 19:03:14 +0000 (12:03 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 28 Oct 2007 19:03:14 +0000 (12:03 -0700)
* 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


Trivial merge