Linus Torvalds 9e5fca251f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (63 commits) IB/qib: clean up properly if pci_set_consistent_dma_mask() fails IB/qib: Allow driver to load if PCIe AER fails IB/qib: Fix uninitialized pointer if CONFIG_PCI_MSI not set IB/qib: Fix extra log level in qib_early_err() RDMA/cxgb4: Remove unnecessary KERN_<level> use RDMA/cxgb3: Remove unnecessary KERN_<level> use IB/core: Add link layer type information to sysfs IB/mlx4: Add VLAN support for IBoE IB/core: Add VLAN support for IBoE IB/mlx4: Add support for IBoE mlx4_en: Change multicast promiscuous mode to support IBoE mlx4_core: Update data structures and constants for IBoE mlx4_core: Allow protocol drivers to find corresponding interfaces IB/uverbs: Return link layer type to userspace for query port operation IB/srp: Sync buffer before posting send IB/srp: Use list_first_entry() IB/srp: Reduce number of BUSY conditions IB/srp: Eliminate two forward declarations IB/mlx4: Signal node desc changes to SM by using FW to generate trap 144 IB: Replace EXTRA_CFLAGS with ccflags-y ...		2010-10-26 17:54:22 -07:00
..
appletalk	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
arcnet	…
arm	…
atl1c	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
atl1e	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
atlx	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
benet	be2net: Changes to use only priority codes allowed by f/w	2010-10-21 07:11:14 -07:00
bna	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
bnx2x	bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.	2010-10-21 19:59:32 -07:00
bonding	bonding: cleanup: remove braces from single block statements	2010-10-21 03:09:49 -07:00
caif	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
can	can: mcp251x: fix generation of error frames	2010-10-21 04:27:03 -07:00
chelsio	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
cris	…
cxgb3	cxgb3: function namespace cleanup	2010-10-21 07:19:02 -07:00
cxgb4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
cxgb4vf	cxgb4vf: make single bit signed bitfields unsigned	2010-10-16 11:13:19 -07:00
e1000	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
e1000e	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
ehea	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-21 08:43:05 -07:00
enic	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
fs_enet	…
hamradio	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
ibm_newemac	…
igb	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
igbvf	vlan: Rename VLAN_GROUP_ARRAY_LEN to VLAN_N_VID.	2010-10-21 01:26:50 -07:00
irda	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
ixgb	vlan: Rename VLAN_GROUP_ARRAY_LEN to VLAN_N_VID.	2010-10-21 01:26:50 -07:00
ixgbe	ixgbe: add a refcnt when turning on/off FCoE offload capability	2010-10-21 03:55:23 -07:00
ixgbevf	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
ixp2000	…
mlx4	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2010-10-26 17:54:22 -07:00
myri10ge	…
netxen	netxen: make local function static.	2010-10-21 03:09:41 -07:00
octeon	…
pch_gbe	pch_gbe: make local functions static	2010-10-21 03:09:44 -07:00
pcmcia	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
phy	phy/marvell: fix 88e1121 support	2010-10-21 03:59:57 -07:00
qlcnic	vlan: Rename VLAN_GROUP_ARRAY_LEN to VLAN_N_VID.	2010-10-21 01:26:50 -07:00
qlge	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
sfc	sfc: make functions static	2010-10-21 03:09:43 -07:00
skfp	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
stmmac	stmmac: remove ifdef NETIF_F_TSO from stmmac_ethtool.c	2010-10-17 13:43:56 -07:00
tokenring	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
tulip	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
usb	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
vmxnet3	vmxnet3: make bit twiddle routines inline	2010-10-21 03:09:44 -07:00
vxge	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
wan	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
wimax	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
wireless	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
3c59x.c	…
3c501.c	…
3c501.h	…
3c503.c	…
3c503.h	…
3c505.c	…
3c505.h	…
3c507.c	…
3c509.c	…
3c515.c	…
3c523.c	3c52x: remove IRQF_SAMPLE_RANDOM from legacy MCA drivers.	2010-10-19 02:32:09 -07:00
3c523.h	…
3c527.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
3c527.h	…
7990.c	…
7990.h	…
8139cp.c	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
8139too.c	…
8390.c	…
8390.h	…
8390p.c	…
82596.c	…
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin	2010-10-25 18:41:32 -07:00
LICENSE.SRC	…
Makefile	Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci	2010-10-25 10:59:31 -07:00
Space.c	…
a2065.c	…
a2065.h	…
ac3200.c	…
acenic.c	…
acenic.h	…
amd8111e.c	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
amd8111e.h	…
apne.c	…
ariadne.c	…
ariadne.h	…
at1700.c	…
atarilance.c	…
atp.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
atp.h	…
au1000_eth.c	…
au1000_eth.h	…
ax88796.c	drivers/net/ax88796.c: Return error code in failure	2010-10-21 04:25:50 -07:00
b44.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-21 08:43:05 -07:00
b44.h	…
bcm63xx_enet.c	…
bcm63xx_enet.h	…
bfin_mac.c	netdev: bfin_mac: push settings to platform resources	2010-10-25 04:54:25 -04:00
bfin_mac.h	netdev: bfin_mac: push settings to platform resources	2010-10-25 04:54:25 -04:00
bmac.c	…
bmac.h	…
bnx2.c	bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.	2010-10-21 19:59:32 -07:00
bnx2.h	bnx2: Increase max rx ring size from 1K to 2K	2010-10-21 03:09:47 -07:00
bnx2_fw.h	…
bsd_comp.c	…
cassini.c	…
cassini.h	…
cnic.c	cnic: Add support for 57712 device	2010-10-14 10:45:56 -07:00
cnic.h	cnic: Add support for 57712 device	2010-10-14 10:45:56 -07:00
cnic_defs.h	bnx2x, cnic, bnx2i: use new FW/HSI	2010-10-06 14:10:35 -07:00
cnic_if.h	cnic: Add support for 57712 device	2010-10-14 10:45:56 -07:00
cpmac.c	…
cs89x0.c	…
cs89x0.h	…
davinci_cpdma.c	…
davinci_cpdma.h	…
davinci_emac.c	…
davinci_mdio.c	…
de600.c	…
de600.h	…
de620.c	…
de620.h	…
declance.c	…
defxx.c	…
defxx.h	…
depca.c	…
depca.h	…
dl2k.c	…
dl2k.h	…
dm9000.c	…
dm9000.h	…
dnet.c	dnet: mark methods static and annotate for correct endianness	2010-10-16 11:13:20 -07:00
dnet.h	…
dummy.c	…
e100.c	…
e2100.c	…
eepro.c	…
eexpress.c	…
eexpress.h	…
enc28j60.c	…
enc28j60_hw.h	…
epic100.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
eql.c	…
es3210.c	…
eth16i.c	…
ethoc.c	…
ewrk3.c	…
ewrk3.h	…
fealnx.c	…
fec.c	net: allow FEC driver to use fixed PHY support	2010-10-13 09:56:31 -07:00
fec.h	…
fec_mpc52xx.c	…
fec_mpc52xx.h	…
fec_mpc52xx_phy.c	…
forcedeth.c	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
fsl_pq_mdio.c	…
fsl_pq_mdio.h	…
gianfar.c	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
gianfar.h	…
gianfar_ethtool.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-21 08:43:05 -07:00
gianfar_sysfs.c	…
greth.c	…
greth.h	…
hamachi.c	…
hp-plus.c	…
hp.c	…
hp100.c	…
hp100.h	…
hplance.c	…
hplance.h	…
hydra.c	…
ibmlana.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
ibmlana.h	…
ibmveth.c	ibmveth: Free irq on error path	2010-10-21 01:26:46 -07:00
ibmveth.h	…
ifb.c	…
ioc3-eth.c	…
ipg.c	…
ipg.h	…
iseries_veth.c	…
jazzsonic.c	…
jme.c	jme: Advance version number	2010-10-21 03:52:11 -07:00
jme.h	jme: Advance version number	2010-10-21 03:52:11 -07:00
korina.c	…
ks8842.c	…
ks8851.c	…
ks8851.h	…
ks8851_mll.c	…
ksz884x.c	…
lance.c	…
lasi_82596.c	…
lib8390.c	…
lib82596.c	…
ll_temac.h	…
ll_temac_main.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-06 19:39:31 -07:00
ll_temac_mdio.c	…
lne390.c	…
loopback.c	…
lp486e.c	…
mac89x0.c	…
mac8390.c	…
macb.c	…
macb.h	…
mace.c	…
mace.h	…
macmace.c	…
macsonic.c	…
macvlan.c	…
macvtap.c	…
mdio.c	…
meth.c	…
meth.h	…
mii.c	…
mipsnet.c	…
mv643xx_eth.c	…
mvme147.c	…
myri_sbus.c	…
myri_sbus.h	…
natsemi.c	…
ne-h8300.c	…
ne.c	…
ne2.c	…
ne2k-pci.c	…
ne3210.c	…
netconsole.c	bonding: Fix netconsole to not deadlock on rmmod	2010-10-18 08:32:08 -07:00
netx-eth.c	…
ni52.c	…
ni52.h	…
ni65.c	…
ni65.h	…
ni5010.c	…
ni5010.h	…
niu.c	niu: introduce temp variables to avoid sparse warnings when swapping in-situ	2010-10-17 13:42:50 -07:00
niu.h	…
ns83820.c	ns83820: spin_lock_irq() => spin_lock()	2010-10-18 01:53:35 -07:00
pasemi_mac.c	…
pasemi_mac.h	…
pasemi_mac_ethtool.c	…
pci-skeleton.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
pcnet32.c	…
plip.c	…
ppp_async.c	net: Ppp_async: semaphore cleanup	2010-10-12 17:36:09 +02:00
ppp_deflate.c	…
ppp_generic.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
ppp_mppe.c	…
ppp_mppe.h	…
ppp_synctty.c	…
pppoe.c	…
pppox.c	…
pptp.c	…
ps3_gelic_net.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
ps3_gelic_net.h	…
ps3_gelic_wireless.c	…
ps3_gelic_wireless.h	…
pxa168_eth.c	…
qla3xxx.c	…
qla3xxx.h	…
r6040.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-21 08:43:05 -07:00
r8169.c	r8169: print errors when dma mapping fail	2010-10-21 01:32:48 -07:00
rionet.c	…
rrunner.c	…
rrunner.h	…
s2io-regs.h	…
s2io.c	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
s2io.h	…
s6gmac.c	…
sb1000.c	…
sb1250-mac.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
sc92031.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
seeq8005.c	…
seeq8005.h	…
sgiseeq.c	…
sgiseeq.h	…
sh_eth.c	…
sh_eth.h	…
sis190.c	…
sis900.c	…
sis900.h	…
skge.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-06 19:39:31 -07:00
skge.h	…
sky2.c	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
sky2.h	…
slhc.c	…
slip.c	…
slip.h	…
smc-mca.c	…
smc-ultra.c	…
smc-ultra32.c	…
smc91x.c	smc91x: Add missing #inclusion of <linux/irq.h>	2010-10-07 14:08:54 +01:00
smc91x.h	…
smc911x.c	…
smc911x.h	…
smc9194.c	…
smc9194.h	…
smsc911x.c	…
smsc911x.h	…
smsc9420.c	…
smsc9420.h	…
sni_82596.c	…
sonic.c	…
sonic.h	…
spider_net.c	…
spider_net.h	…
spider_net_ethtool.c	…
starfire.c	…
stnic.c	…
sun3_82586.c	…
sun3_82586.h	…
sun3lance.c	…
sunbmac.c	…
sunbmac.h	…
sundance.c	sundance: Add initial ethtool stats support	2010-10-16 11:13:21 -07:00
sungem.c	…
sungem.h	…
sungem_phy.c	…
sungem_phy.h	…
sunhme.c	…
sunhme.h	…
sunlance.c	…
sunqe.c	…
sunqe.h	…
sunvnet.c	…
sunvnet.h	…
tc35815.c	…
tehuti.c	…
tehuti.h	…
tg3.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-21 08:43:05 -07:00
tg3.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-21 08:43:05 -07:00
tlan.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
tlan.h	…
tsi108_eth.c	…
tsi108_eth.h	…
tun.c	…
typhoon.c	…
typhoon.h	…
ucc_geth.c	…
ucc_geth.h	…
ucc_geth_ethtool.c	…
veth.c	…
via-rhine.c	…
via-velocity.c	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
via-velocity.h	via-velocity: forced 1000 Mbps mode support.	2010-10-16 11:13:23 -07:00
virtio_net.c	…
wd.c	…
xen-netfront.c	…
xilinx_emaclite.c	Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze	2010-10-25 16:53:11 -07:00
xtsonic.c	…
yellowfin.c	…
znet.c	…
zorro8390.c	…