David S. Miller e548833df8 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	net/mac80211/main.c

2010-09-09 22:27:33 -07: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: do not use del_timer_sync() in interrupt context

2010-08-19 20:28:25 +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 branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-09-09 22:27:33 -07: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

firewire: ohci: work around VIA and NEC PHY packet reception bug

2010-08-29 09:17:31 +02:00

ohci.h

firewire: add CSR cmstr support

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

sbp2.c

firewire: sbp2: fix stall with "Unsolicited response"

2010-08-19 20:28:25 +02:00