Linus Torvalds 55ddf14b04 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: schedule for removal firewire: core: use separate timeout for each transaction firewire: core: Fix tlabel exhaustion problem firewire: core: make transaction label allocation more robust firewire: core: clean up config ROM related defined constants ieee1394: mark char device files as not seekable firewire: cdev: mark char device files as not seekable firewire: ohci: cleanups and fix for nonstandard build without debug facility firewire: ohci: wait for PHY register accesses to complete firewire: ohci: fix up configuration of TI chips firewire: ohci: enable 1394a enhancements firewire: ohci: do not clear PHY interrupt status inadvertently firewire: ohci: add a function for reading PHY registers Trivial conflicts in Documentation/feature-removal-schedule.txt		2010-05-27 10:22:06 -07:00
..
config_roms.c	ieee1394: eth1394: don't autoload by hotplug when ohci1394 starts	2007-04-30 00:00:30 +02:00
config_roms.h	ieee1394: eth1394: don't autoload by hotplug when ohci1394 starts	2007-04-30 00:00:30 +02:00
csr1212.c	ieee1394/csr1212: fix false positive kmemcheck report	2009-06-15 15:49:31 +02:00
csr1212.h	ieee1394: mark bus_info_data as a __be32 array	2009-01-04 23:50:35 +01:00
csr.c	ieee1394: Storage class should be before const qualifier	2009-03-24 20:56:52 +01:00
csr.h	ieee1394: replace CSR_SET_BUS_INFO_GENERATION macro	2009-01-04 23:50:35 +01:00
dma.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dma.h	firesat: copyrights, rename to firedtv, API conversions, fix remote control input	2009-02-24 14:51:26 +01:00
dv1394-private.h	ieee1394: dv1394: annotate frame input/output structs as little endian	2009-01-04 23:50:36 +01:00
dv1394.c	ieee1394: mark char device files as not seekable	2010-04-10 16:51:15 +02:00
dv1394.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
eth1394.c	drivers: Kill now superfluous ->last_rx stores	2009-09-02 23:07:36 -07:00
eth1394.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-01-08 11:05:59 -08:00
highlevel.c	ieee1394: Storage class should be before const qualifier	2009-03-24 20:56:52 +01:00
highlevel.h	ieee1394: mark all hpsb_address_ops instances as const	2009-01-04 23:50:32 +01:00
hosts.c	ieee1394: replace CSR_SET_BUS_INFO_GENERATION macro	2009-01-04 23:50:35 +01:00
hosts.h	ieee1394: mark bus_info_data as a __be32 array	2009-01-04 23:50:35 +01:00
ieee1394_core.c	Make ieee1394_init a fs-initcall	2009-02-26 10:32:31 -08:00
ieee1394_core.h	fs: Remove i_cindex from struct inode	2009-06-11 21:36:09 -04:00
ieee1394_hotplug.h	[PATCH] ieee1394: remove redundant code from ieee1394_hotplug.h	2006-07-03 12:02:30 -04:00
ieee1394_transactions.c	ieee1394: remove superfluous assertions	2009-02-24 14:51:28 +01:00
ieee1394_transactions.h	firesat: copyrights, rename to firedtv, API conversions, fix remote control input	2009-02-24 14:51:26 +01:00
ieee1394_types.h	ieee1394: safer definition of empty macros	2006-09-17 19:31:20 +02:00
ieee1394-ioctl.h	ieee1394: cycle timer read extension for raw1394	2007-02-17 14:39:33 +01:00
ieee1394.h	ieee1394: support for speeds greater than S800	2009-01-28 20:31:05 +01:00
init_ohci1394_dma.c	x86: early boot debugging via FireWire (ohci1394_dma=early)	2008-01-30 13:34:11 +01:00
iso.c	PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures	2008-07-24 10:47:21 -07:00
iso.h	firesat: copyrights, rename to firedtv, API conversions, fix remote control input	2009-02-24 14:51:26 +01:00
Kconfig	firewire, ieee1394: update Kconfig help	2009-12-29 19:58:17 +01:00
Makefile	x86: early boot debugging via FireWire (ohci1394_dma=early)	2008-01-30 13:34:11 +01:00
nodemgr.c	Driver core: create lock/unlock functions for struct device	2010-03-07 17:04:52 -08:00
nodemgr.h	ieee1394: constify device ID tables	2009-03-24 20:56:53 +01:00
ohci1394.c	ieee1394: Use hweight32	2009-11-18 20:30:35 +01:00
ohci1394.h	ieee1394: ohci1394: increase AT req. retries, fix ack_busy_X from Panasonic camcorders and others	2009-01-24 11:17:28 +01:00
pcilynx.c	Fix misspelling of "should" and "shouldn't" in comments.	2010-02-05 12:22:30 +01:00
pcilynx.h	ieee1394: pcilynx: trivial endian annotation	2009-01-04 23:50:34 +01:00
raw1394-private.h	ieee1394: raw1394: replace BKL by local mutex, make ioctl() and mmap() thread-safe	2008-10-15 22:21:08 +02:00
raw1394.c	ieee1394: mark char device files as not seekable	2010-04-10 16:51:15 +02:00
raw1394.h	ieee1394: remove old isochronous ABI	2007-07-10 00:07:41 +02:00
sbp2.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
sbp2.h	ieee1394: sbp2: add support for disks >2 TB (and 16 bytes long CDBs)	2009-07-02 21:27:01 +02:00
video1394.c	ieee1394: mark char device files as not seekable	2010-04-10 16:51:15 +02:00
video1394.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00