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
config_roms.h
csr1212.c
csr1212.h
csr.c
csr.h
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
dv1394-private.h
dv1394.c	ieee1394: mark char device files as not seekable	2010-04-10 16:51:15 +02:00
dv1394.h
eth1394.c	drivers: Kill now superfluous ->last_rx stores	2009-09-02 23:07:36 -07:00
eth1394.h
highlevel.c
highlevel.h
hosts.c
hosts.h
ieee1394_core.c
ieee1394_core.h
ieee1394_hotplug.h
ieee1394_transactions.c
ieee1394_transactions.h
ieee1394_types.h
ieee1394-ioctl.h
ieee1394.h
init_ohci1394_dma.c
iso.c
iso.h
Kconfig	firewire, ieee1394: update Kconfig help	2009-12-29 19:58:17 +01:00
Makefile
nodemgr.c	Driver core: create lock/unlock functions for struct device	2010-03-07 17:04:52 -08:00
nodemgr.h
ohci1394.c	ieee1394: Use hweight32	2009-11-18 20:30:35 +01:00
ohci1394.h
pcilynx.c	Fix misspelling of "should" and "shouldn't" in comments.	2010-02-05 12:22:30 +01:00
pcilynx.h
raw1394-private.h
raw1394.c	ieee1394: mark char device files as not seekable	2010-04-10 16:51:15 +02:00
raw1394.h
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
video1394.c	ieee1394: mark char device files as not seekable	2010-04-10 16:51:15 +02:00
video1394.h