From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 2 Aug 2007 03:48:42 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: MMI-PSA29.97-13-9~40897
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=878701db07db3f0b59f14f0c525b681e4ca81551;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge /pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  scc_pata: PIO fixes
  piix/slc90e66: fix PIO1 handling in ->speedproc method (take 2)
  jmicron: PIO fixes
  it8213: PIO fixes (take 2)
  cs5535: PIO fixes
  cs5520: fix PIO auto-tuning in ->ide_dma_check method
  drivers/scsi/ide-scsi.c: kmalloc + memset conversion to kzalloc
  drivers/ide/arm/icside.c: kmalloc + memset conversion to kzalloc
  ide: eliminate warnings in ide-tape.c
  ide: fix runtogether printk's in cmd64x IDE driver
  sis5513: Add FSC Amilo A1630 PCI subvendor/dev to laptops
  alim15x3: Correct HP detect
  ide: Fix an overrun found in the CS5535 IDE driver
---

878701db07db3f0b59f14f0c525b681e4ca81551