Linus Torvalds 0cd43f83d3 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 ... * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (48 commits) ieee1394: raw1394: arm functions slept in atomic context ieee1394: sbp2: enable auto spin-up for all SBP-2 devices MAINTAINERS: updates to IEEE 1394 subsystem maintainership ieee1394: ohci1394: check for errors in suspend or resume set power state of firewire host during suspend ieee1394: ohci1394: more obvious endianess handling ieee1394: ohci1394: fix endianess bug in debug message ieee1394: sbp2: don't prefer MODE SENSE 10 ieee1394: nodemgr: grab class.subsys.rwsem in nodemgr_resume_ne ieee1394: nodemgr: fix rwsem recursion ieee1394: sbp2: more help in Kconfig ieee1394: sbp2: prevent rare deadlock in shutdown ieee1394: sbp2: update includes ieee1394: sbp2: better handling of transport errors ieee1394: sbp2: recheck node generation in sbp2_update ieee1394: sbp2: safer agent reset in error handlers ieee1394: sbp2: handle "sbp2util_node_write_no_wait failed" CONFIG_PM=n slim: drivers/ieee1394/ohci1394.c ieee1394: safer definition of empty macros video1394: add poll file operation support ...		2006-09-30 09:38:19 -07:00
..
.gitignore	…
Kconfig	ieee1394: sbp2: more help in Kconfig	2006-09-17 19:34:50 +02:00
Makefile	…
config_roms.c	…
config_roms.h	…
csr.c	…
csr.h	…
csr1212.c	…
csr1212.h	…
dma.c	…
dma.h	…
dv1394-private.h	…
dv1394.c	ieee1394: safer definition of empty macros	2006-09-17 19:31:20 +02:00
dv1394.h	…
eth1394.c	ieee1394: remove #include <asm/semaphore.h>	2006-09-17 19:18:50 +02:00
eth1394.h	…
highlevel.c	…
highlevel.h	…
hosts.c	ieee1394: shrink tlabel pools, remove tpool semaphores	2006-09-17 19:17:13 +02:00
hosts.h	ieee1394: shrink tlabel pools, remove tpool semaphores	2006-09-17 19:17:13 +02:00
ieee1394-ioctl.h	…
ieee1394.h	…
ieee1394_core.c	ieee1394: safer definition of empty macros	2006-09-17 19:31:20 +02:00
ieee1394_core.h	ieee1394: remove #include <asm/semaphore.h>	2006-09-17 19:18:50 +02:00
ieee1394_hotplug.h	…
ieee1394_transactions.c	ieee1394: shrink tlabel pools, remove tpool semaphores	2006-09-17 19:17:13 +02:00
ieee1394_transactions.h	ieee1394: shrink tlabel pools, remove tpool semaphores	2006-09-17 19:17:13 +02:00
ieee1394_types.h	ieee1394: safer definition of empty macros	2006-09-17 19:31:20 +02:00
iso.c	…
iso.h	…
nodemgr.c	ieee1394: nodemgr: grab class.subsys.rwsem in nodemgr_resume_ne	2006-09-17 19:38:43 +02:00
nodemgr.h	ieee1394: shrink tlabel pools, remove tpool semaphores	2006-09-17 19:17:13 +02:00
ohci1394.c	ieee1394: ohci1394: check for errors in suspend or resume	2006-09-17 19:41:45 +02:00
ohci1394.h	…
oui.db	…
oui2c.sh	…
pcilynx.c	i2c-algo-bit: Discard the mdelay data struct member	2006-09-26 15:38:51 -07:00
pcilynx.h	…
raw1394-private.h	…
raw1394.c	ieee1394: raw1394: arm functions slept in atomic context	2006-09-23 15:13:55 +02:00
raw1394.h	…
sbp2.c	ieee1394: sbp2: enable auto spin-up for all SBP-2 devices	2006-09-17 19:53:01 +02:00
sbp2.h	ieee1394: sbp2: prevent rare deadlock in shutdown	2006-09-17 19:34:44 +02:00
video1394.c	ieee1394: safer definition of empty macros	2006-09-17 19:31:20 +02:00
video1394.h	…