Stefan Richter e78483c5ae Merge firewire branches to be released post v2.6.35 ...

Conflicts:
	drivers/firewire/core-card.c
	drivers/firewire/core-cdev.c

and forgotten #include <linux/time.h> in drivers/firewire/ohci.c

Signed-off-by: Stefan Richter <[email protected]>

2010-08-02 10:09:04 +02:00

..

core-card.c

Merge firewire branches to be released post v2.6.35

2010-08-02 10:09:04 +02:00

core-cdev.c

Merge firewire branches to be released post v2.6.35

2010-08-02 10:09:04 +02:00

core-device.c

Merge firewire branches to be released post v2.6.35

2010-08-02 10:09:04 +02:00

core-iso.c

Merge firewire branches to be released post v2.6.35

2010-08-02 10:09:04 +02:00

core-topology.c

firewire: core: fix fw_send_request kerneldoc comment

2010-07-13 09:47:47 +02:00

core-transaction.c

firewire: core: fix upper bound of possible CSR allocations

2010-07-23 13:36:28 +02:00

core.h

firewire: add isochronous multichannel reception

2010-07-29 23:09:18 +02:00

Kconfig

tools/firewire: add userspace front-end of nosy

2010-07-27 11:04:11 +02:00

Makefile

firewire: new driver: nosy - IEEE 1394 traffic sniffer

2010-07-27 11:04:10 +02:00

net.c

Merge firewire branches to be released post v2.6.35

2010-08-02 10:09:04 +02:00

nosy-user.h

firewire: nosy: endianess fixes and annotations

2010-07-27 11:04:11 +02:00

nosy.c

firewire: nosy: use generic printk macros

2010-07-27 11:04:11 +02:00

nosy.h

firewire: nosy: misc cleanups

2010-07-27 11:04:10 +02:00

ohci.c

Merge firewire branches to be released post v2.6.35

2010-08-02 10:09:04 +02:00

ohci.h

firewire: add CSR cmstr support

2010-06-10 08:36:37 +02:00

sbp2.c

Merge firewire branches to be released post v2.6.35

2010-08-02 10:09:04 +02:00