From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Dec 2008 01:34:37 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: MMI-PSA29.97-13-9~30454
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=74a6d0f064cd9106599ce3f1d924309669e83582;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge git://git./linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (33 commits)
  ide-cd: remove dead dsc_overlap setting
  ide: push local_irq_{save,restore}() to do_identify()
  ide: remove superfluous local_irq_{save,restore}() from ide_dump_status()
  ide: move legacy ISA/VLB ports handling to ide-legacy.c (v2)
  ide: move Power Management support to ide-pm.c
  ide: use ATA_DMA_* defines in ide-dma-sff.c
  ide: checkpatch.pl fixes for ide-lib.c
  ide: remove inline tags from ide-probe.c
  ide: remove redundant code from ide_end_drive_cmd()
  ide: struct device - replace bus_id with dev_name(), dev_set_name()
  ide: rework handling of serialized ports (v2)
  cy82c693: remove superfluous ide_cy82c693 chipset type
  trm290: add IDE_HFLAG_TRM290 host flag
  ide: add ->max_sectors field to struct ide_port_info
  rz1000: apply chipset quirks early (v2)
  ide: always set nIEN on idle devices
  ide: fix ->quirk_list checking in ide_do_request()
  gayle: set IDE_HFLAG_SERIALIZE explictly
  cmd64x: set IDE_HFLAG_SERIALIZE explictly for CMD646
  ali14xx: doesn't use shared IRQs
  ...
---

74a6d0f064cd9106599ce3f1d924309669e83582