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

Conflicts:
	net/bluetooth/l2cap_core.c

2011-07-14 07:56:40 -07:00

..

core-card.c

firewire: sbp2: parallelize login, reconnect, logout

2011-05-10 22:53:46 +02:00

core-cdev.c

firewire: sbp2: parallelize login, reconnect, logout

2011-05-10 22:53:46 +02:00

core-device.c

firewire: sbp2: parallelize login, reconnect, logout

2011-05-10 22:53:46 +02:00

core-iso.c

firewire: optimize iso queueing by setting wake only after the last packet

2011-05-10 22:53:45 +02:00

core-topology.c

firewire: core: fix card->reset_jiffies overflow

2011-01-23 12:31:01 +01:00

core-transaction.c

firewire: sbp2: parallelize login, reconnect, logout

2011-05-10 22:53:46 +02:00

core.h

firewire: sbp2: parallelize login, reconnect, logout

2011-05-10 22:53:46 +02:00

init_ohci1394_dma.c

ieee1394: move init_ohci1394_dma to drivers/firewire/

2010-10-11 14:48:03 +02:00

Kconfig

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

2011-03-21 10:05:22 -07:00

Makefile

ieee1394: move init_ohci1394_dma to drivers/firewire/

2010-10-11 14:48:03 +02:00

net.c

net: Push protocol type directly down to header_ops->cache()

2011-07-13 02:29:59 -07:00

nosy-user.h

firewire: nosy: endianess fixes and annotations

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

nosy.c

firewire: nosy: char device is not seekable

2010-12-12 15:47:02 +01:00

nosy.h

…

ohci.c

firewire: ohci: do not bind to Pinnacle cards, avert panic

2011-07-10 12:53:27 +02:00

ohci.h

firewire: ohci: fix TI TSB82AA2 regression since 2.6.35

2010-10-17 14:09:12 +02:00

sbp2.c

firewire: sbp2: parallelize login, reconnect, logout

2011-05-10 22:53:46 +02:00