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

..

config_roms.c

…

config_roms.h

…

csr1212.c

ieee1394/csr1212: fix false positive kmemcheck report

2009-06-15 15:49:31 +02:00

csr1212.h

…

csr.c

ieee1394: Storage class should be before const qualifier

2009-03-24 20:56:52 +01:00

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: Remove unnecessary casts of private_data

2010-07-13 09:59:32 +02:00

dv1394.h

…

eth1394.c

ethtool: Provide a default implementation of ethtool_ops::get_drvinfo

2010-08-17 02:31:15 -07:00

eth1394.h

…

highlevel.c

ieee1394: Storage class should be before const qualifier

2009-03-24 20:56:52 +01:00

highlevel.h

…

hosts.c

…

hosts.h

…

ieee1394_core.c

Make ieee1394_init a fs-initcall

2009-02-26 10:32:31 -08:00

ieee1394_core.h

fs: Remove i_cindex from struct inode

2009-06-11 21:36:09 -04:00

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

ieee1394: constify device ID tables

2009-03-24 20:56:53 +01:00

ohci1394.c

ieee1394: Adjust confusing if indentation

2010-08-05 23:26:30 +02: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: Remove unnecessary casts of private_data

2010-07-13 09:59:32 +02:00

raw1394.h

…

sbp2.c

Merge firewire branches to be released post v2.6.35

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

sbp2.h

ieee1394: sbp2: add support for disks >2 TB (and 16 bytes long CDBs)

2009-07-02 21:27:01 +02:00

video1394.c

ieee1394: Remove unnecessary casts of private_data

2010-07-13 09:59:32 +02:00

video1394.h

…