Linus Torvalds d9428f0976 Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata ... Pull libata update from Tejun Heo: "AHCI is getting per-port irq handling and locks for better scalability. The gain is not huge but measureable with multiple high iops devices connected to the same host; however, the value of threaded IRQ handling seems negligible for AHCI and it likely will revert to non-threaded handling soon. Another noteworthy change is George Spelvin's "libata: Un-break ATA blacklist". During 3.17 devel cycle, the libata blacklist glob matching got generalized and rewritten; unfortunately, the patch forgot to swap arguments to match the new match function and ended up breaking blacklist matching completely. It got noticed only a couple days ago so it couldn't make for-3.17-fixes either. :( Other than the above two, nothing too interesting - the usual cleanup churns and device-specific changes" * 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (22 commits) pata_serverworks: disable 64-KB DMA transfers on Broadcom OSB4 IDE Controller libata: Un-break ATA blacklist AHCI: Do not acquire ata_host::lock from single IRQ handler AHCI: Optimize single IRQ interrupt processing AHCI: Do not read HOST_IRQ_STAT reg in multi-MSI mode AHCI: Make few function names more descriptive AHCI: Move host activation code into ahci_host_activate() AHCI: Move ahci_host_activate() function to libahci.c AHCI: Pass SCSI host template as arg to ahci_host_activate() ata: pata_imx: Use the SIMPLE_DEV_PM_OPS() macro AHCI: Cleanup checking of multiple MSIs/SLM modes libata-sff: Fix controllers with no ctl port ahci_xgene: Fix the error print invalid resource for APM X-Gene SoC AHCI SATA Host Controller driver. libata: change ata_<foo>_printk routines to return void ata: qcom: Add device tree bindings information ahci-platform: Bump max number of clocks to 5 ahci: ahci_p5wdh_workaround - constify DMI table libahci_platform: Staticize ahci_platform_<en/dis>able_phys() pata_platform: Remove useless irq_flags field pata_of_platform: Remove "electra-ide" quirk ...		2014-10-10 07:23:11 -04:00
..
boot	blackfin: Ignore generated uImages	2013-09-13 10:42:39 +08:00
configs	defconfig: BF609: update spi config name	2014-07-26 08:32:49 +08:00
include	irq_work: Introduce arch_irq_work_has_interrupt()	2014-09-13 18:38:07 +02:00
kernel	Merge branch 'signal-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc	2014-08-09 09:58:12 -07:00
lib	blackfin: license: Change ADI BSD license	2012-05-21 14:54:30 +08:00
mach-bf518	blackfin: cleanup board files	2014-04-12 08:48:01 +08:00
mach-bf527	blackfin: cleanup board files	2014-04-12 08:48:01 +08:00
mach-bf533	blackfin: fix some bf5xx boards build for missing <linux/gpio.h>	2014-07-26 08:32:45 +08:00
mach-bf537	pata_platform: Remove useless irq_flags field	2014-08-23 13:05:08 -04:00
mach-bf538	blackfin: cleanup board files	2014-04-12 08:48:01 +08:00
mach-bf548	blackfin: bind different groups of one pinmux function to different state name	2014-07-26 08:32:46 +08:00
mach-bf561	pata_platform: Remove useless irq_flags field	2014-08-23 13:05:08 -04:00
mach-bf609	blackfin: bind different groups of one pinmux function to different state name	2014-07-26 08:32:46 +08:00
mach-common	treewide: Fix typo in printk	2014-08-26 09:35:54 +02:00
mm	mm/blackfin: prepare for removing num_physpages and simplify mem_init()	2013-07-03 16:07:35 -07:00
oprofile	Blackfin arch: remove hardware PM code, oprofile not use it	2009-01-07 23:14:39 +08:00
Clear_BSD.txt	blackfin: license: Change ADI BSD license	2012-05-21 14:54:30 +08:00
Kconfig	treewide: Fix typos in Kconfig	2014-09-26 11:12:28 +02:00
Kconfig.debug	consolidate per-arch stack overflow debugging options	2013-07-04 11:25:39 -07:00
Makefile	blackfin: rename vmImage to uImage after we move to buildroot	2013-05-07 18:26:39 +08:00