From: Linus Torvalds Date: Fri, 1 Feb 2008 21:47:54 +0000 (+1100) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cbb51afa6d69be003cc827a89e023906885f241e;p=linux-beck.git Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (24 commits) pci: allow multiple calls to pcim_enable_device() Blackfin pata-bf54x driver: fix compiling bug - no ata_port struct in struct ata_device any more Blackfin pata-bf54x driver: should cover all possible interrupt sources Blackfin pata-bf54x driver: Add debug information Blackfin pata-bf54x driver: Remove obsolete PM function pata_sl82c105: dual channel support ata_piix.c: make piix_merge_scr() static sata_nv: fix for completion handling sata_mv: Remove PCI dependency sata_mv ncq Comments and version bump sata_mv ncq Remove post internal cmd op sata_mv ncq Enable NCQ operation sata_mv ncq Introduce per-tag SG tables ata_piix: IDE mode SATA patch for Intel ICH10 DeviceID's ahci: RAID mode SATA patch for Intel ICH10 DeviceID's sata_mv ncq Use DMA memory pools for hardware memory tables sata_mv ncq Restrict max sectors to 8-bits on GenII NCQ sata_mv ncq Ignore response status LSB on NCQ sata_mv ncq Use hqtag instead of ioid sata_mv ncq Add want ncq parameter for EDMA configuration ... --- cbb51afa6d69be003cc827a89e023906885f241e