Linus Torvalds 6edad161cd Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev ... * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (258 commits) [libata] conversion to new debug scheme, part 1 of $N [PATCH] libata: Add ata_scsi_dev_disabled [libata] Add host lock to struct ata_port [PATCH] libata: implement per-dev EH action mask eh_info->dev_action[] [PATCH] libata-dev: move the CDB-intr DMA blacklisting [PATCH] ahci: disable NCQ support on vt8251 [libata] ahci: add JMicron PCI IDs [libata] sata_nv: add PCI IDs [libata] ahci: Add NVIDIA PCI IDs. [PATCH] libata: convert several bmdma-style controllers to new EH, take #3 [PATCH] sata_via: convert to new EH, take #3 [libata] sata_nv: s/spin_lock_irqsave/spin_lock/ in irq handler [PATCH] sata_nv: add hotplug support [PATCH] sata_nv: convert to new EH [PATCH] sata_nv: better irq handlers [PATCH] sata_nv: simplify constants [PATCH] sata_nv: kill struct nv_host_desc and nv_host [PATCH] sata_nv: kill not-working hotplug code [libata] Update docs to reflect current driver API [PATCH] libata: add host_set->next for legacy two host_sets case, take #3 ...		2006-06-23 15:58:44 -07:00
..
man	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
.gitignore	[PATCH] DocBook: add .gitignore file	2006-01-10 08:01:52 -08:00
Makefile	typos: s/ducument/document/	2006-04-01 01:04:59 +02:00
deviceiobook.tmpl	[PATCH] remove ISA legacy functions: remove documentation	2006-03-24 07:33:19 -08:00
gadget.tmpl	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
journal-api.tmpl	[PATCH] jbd doc: fix some kernel-doc warnings	2005-11-07 07:53:55 -08:00
kernel-api.tmpl	[PATCH] Doc: add audit & acct to DocBook	2006-06-23 07:43:07 -07:00
kernel-hacking.tmpl	[PATCH] fixup Documentation/DocBook/kernel-hacking.tmpl	2005-09-21 10:11:55 -07:00
kernel-locking.tmpl	[PATCH] mutex subsystem, documentation	2006-01-09 15:59:20 -08:00
libata.tmpl	[libata] Update docs to reflect current driver API	2006-06-13 20:27:03 -04:00
librs.tmpl	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
lsm.tmpl	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
mcabook.tmpl	[kernel-doc] fix various DocBook build problems/warnings	2005-09-07 01:15:17 -04:00
mtdnand.tmpl	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
procfs-guide.tmpl	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
procfs_example.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
rapidio.tmpl	[PATCH] RapidIO support: core base	2005-11-07 07:53:46 -08:00
stylesheet.xsl	[PATCH] DocBook: comment about paper type	2005-11-13 18:14:21 -08:00
usb.tmpl	[PATCH] USB: reorg some functions out of the main usb.c file	2006-01-04 13:48:31 -08:00
videobook.tmpl	Fix "stuct", "strut", "struc" typos	2006-01-15 02:12:54 +01:00
wanbook.tmpl	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
writing_usb_driver.tmpl	[PATCH] Driver Core: Big kfree NULL check cleanup - Documentation	2005-10-28 09:52:55 -07:00
z8530book.tmpl	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00