Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) fs: Merge split strings treewide: fix potentially dangerous trailing ';' in #defined values/expressions uwb: Fix misspelling of neighbourhood in comment net, netfilter: Remove redundant goto in ebt_ulog_packet trivial: don't touch files that are removed in the staging tree lib/vsprintf: replace link to Draft by final RFC number doc: Kconfig: `to be' -> `be' doc: Kconfig: Typo: square -> squared doc: Konfig: Documentation/power/{pm => apm-acpi}.txt drivers/net: static should be at beginning of declaration drivers/media: static should be at beginning of declaration drivers/i2c: static should be at beginning of declaration XTENSA: static should be at beginning of declaration SH: static should be at beginning of declaration MIPS: static should be at beginning of declaration ARM: static should be at beginning of declaration rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check Update my e-mail address PCIe ASPM: forcedly -> forcibly gma500: push through device driver tree ... Fix up trivial conflicts: - arch/arm/mach-ep93xx/dma-m2p.c (deleted) - drivers/gpio/gpio-ep93xx.c (renamed and context nearby) - drivers/net/r8169.c (just context changes)		2011-07-25 13:56:39 -07:00
..
appletalk
arcnet
arm	net: am79c961a: Omit check for multicast bit in netdev_for_each_mc_addr	2011-06-30 22:13:38 -07:00
atl1c	atl1c: do vlan cleanup	2011-07-21 13:47:54 -07:00
atl1e	atl1e: do vlan cleanup	2011-07-21 13:47:54 -07:00
atlx	atl2: do vlan cleanup	2011-07-21 13:47:56 -07:00
benet	be2net: request native mode each time the card is reset	2011-07-21 21:32:54 -07:00
bna	bnad: remove duplicated #include	2011-07-23 20:01:15 -07:00
bnx2x	bnx2x: use pci_pcie_cap()	2011-07-24 13:11:40 -07:00
bonding	bonding: do vlan cleanup	2011-07-21 13:47:58 -07:00
caif	net: fix warning of versioncheck	2011-07-07 00:26:31 -07:00
can	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
chelsio	chelsio: do vlan cleanup	2011-07-21 13:47:54 -07:00
cris
cxgb3	cxgb3: do vlan cleanup	2011-07-21 13:47:56 -07:00
cxgb4	cxgb4: remove forgotten unused vlan_group	2011-07-21 13:47:54 -07:00
cxgb4vf	cxgb4vf: do vlan cleanup	2011-07-21 13:47:54 -07:00
e1000	e1000: always call e1000_check_for_link() on e1000_ce4100 MACs.	2011-07-21 22:53:41 -07:00
e1000e	e1000e: use GFP_KERNEL allocations at init time	2011-07-12 22:07:56 -07:00
ehea	ehea: do vlan cleanup	2011-07-21 13:47:53 -07:00
enic	enic: do vlan cleanup	2011-07-21 13:47:55 -07:00
fs_enet	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
hamradio	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-07-05 23:23:37 -07:00
ibm_newemac
igb	igb: remove duplicated #include	2011-07-23 20:01:15 -07:00
igbvf	igbvf: do vlan cleanup	2011-07-21 13:47:55 -07:00
irda	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
ixgb
ixgbe	ixgbe: convert to ndo_fix_features	2011-07-21 22:57:38 -07:00
ixgbevf	ixgbevf: do vlan cleanup	2011-07-21 13:47:56 -07:00
ixp2000
mlx4	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2011-07-22 14:50:12 -07:00
myri10ge	myri10ge: update version	2011-06-29 06:02:05 -07:00
netxen	netxen: add fw version compatibility check	2011-07-21 21:32:54 -07:00
octeon
pch_gbe
pcmcia
phy
qlcnic	qlcnic: remove usage of vlan_group_get_device	2011-07-21 13:47:57 -07:00
qlge	qlge: remove duplicated #include	2011-07-23 20:01:15 -07:00
sfc	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next	2011-07-14 08:43:32 -07:00
skfp
stmmac	stmmac: unify MAC and PHY configuration parameters (V2)	2011-07-21 15:29:16 -07:00
tile
tokenring
tulip	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-07-21 13:38:42 -07:00
usb	ASIX: Add AX88772B USB ID	2011-07-21 20:39:42 -07:00
vmxnet3	vmxnet3: fix publicity of NETIF_F_HIGHDMA	2011-07-21 20:39:47 -07:00
vxge	vxge: do vlan cleanup	2011-07-21 13:47:57 -07:00
wan	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
wimax
wireless	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
xen-netback	xen/netback: Add module alias for autoloading	2011-06-30 11:19:09 -07:00
3c59x.c
3c501.c
3c501.h
3c503.c
3c503.h
3c505.c
3c505.h
3c507.c
3c509.c
3c515.c
3c523.c
3c523.h
3c527.c
3c527.h
7990.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
7990.h
8139cp.c	8139cp: convert to new VLAN model.	2011-07-15 08:08:26 -07:00
8139too.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-07-05 23:23:37 -07:00
8390.c
8390.h
8390p.c
82596.c
a2065.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
a2065.h
ac3200.c
acenic.c	acenic: include NET_SKB_PAD headroom to incoming skbs	2011-07-21 23:24:52 -07:00
acenic.h	acenic: do vlan cleanup	2011-07-21 13:47:56 -07:00
amd8111e.c	amd8111e: do vlan cleanup	2011-07-21 13:47:54 -07:00
amd8111e.h	amd8111e: do vlan cleanup	2011-07-21 13:47:54 -07:00
apne.c
ariadne.c	ariadne: Update style, neaten, restructure to eliminate prototypes	2011-06-24 17:31:36 -07:00
ariadne.h
at1700.c
atarilance.c
atp.c
atp.h
au1000_eth.c
au1000_eth.h
ax88796.c
b44.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
b44.h
bcm63xx_enet.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
bcm63xx_enet.h
bfin_mac.c
bfin_mac.h
bmac.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
bmac.h
bnx2_fw.h
bnx2.c	bnx2: Fix endian swapping on firmware version string	2011-07-21 12:38:32 -07:00
bnx2.h	bnx2: Read iSCSI config from shared memory during ->probe()	2011-07-14 08:46:08 -07:00
bsd_comp.c	treewide: fix potentially dangerous trailing ';' in #defined values/expressions	2011-07-21 14:10:00 +02:00
cassini.c
cassini.h
cnic_defs.h
cnic_if.h	cnic: Add VLAN ID as a parameter during netevent upcall	2011-07-21 12:38:32 -07:00
cnic.c	cnic: Add VLAN ID as a parameter during netevent upcall	2011-07-21 12:38:32 -07:00
cnic.h
cpmac.c
cs89x0.c
cs89x0.h
davinci_cpdma.c
davinci_cpdma.h
davinci_emac.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
davinci_mdio.c
de600.c
de600.h
de620.c
de620.h
declance.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
defxx.c
defxx.h
depca.c	net: depca: Use helpers from linux/etherdevice.h	2011-07-04 20:27:29 -07:00
depca.h
dl2k.c
dl2k.h
dm9000.c
dm9000.h
dnet.c
dnet.h
dummy.c
e100.c
e2100.c
eepro.c
eexpress.c	treewide: transciever/transceiver spelling fixes	2011-06-24 11:20:14 +02:00
eexpress.h
enc28j60_hw.h
enc28j60.c
epic100.c
eql.c
es3210.c
eth16i.c
ethoc.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
ewrk3.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
ewrk3.h
fealnx.c
fec_mpc52xx_phy.c
fec_mpc52xx.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
fec_mpc52xx.h
fec.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
fec.h
forcedeth.c	forcedeth: do vlan cleanup	2011-07-21 13:47:57 -07:00
fsl_pq_mdio.c
fsl_pq_mdio.h
ftgmac100.c
ftgmac100.h
ftmac100.c
ftmac100.h
gianfar_ethtool.c	gianfar: do vlan cleanup	2011-07-21 13:47:55 -07:00
gianfar_ptp.c
gianfar_sysfs.c
gianfar.c	gianfar: do vlan cleanup	2011-07-21 13:47:55 -07:00
gianfar.h	gianfar: do vlan cleanup	2011-07-21 13:47:55 -07:00
greth.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-07-05 23:23:37 -07:00
greth.h
hamachi.c
hp100.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c
ibmlana.h
ibmveth.c
ibmveth.h
ifb.c
ioc3-eth.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
ipg.c
ipg.h
iseries_veth.c	net: iseries_veth: Use is_unicast_ether_addr helper	2011-07-04 20:27:29 -07:00
jazzsonic.c
jme.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-07-21 20:21:27 -07:00
jme.h	jme: do vlan cleanup	2011-07-21 13:47:55 -07:00
Kconfig	68360enet: Remove Kconfig/Makefile references	2011-07-16 12:35:27 -07:00
korina.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
ks8842.c
ks8851_mll.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
ks8851.c
ks8851.h
ksz884x.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
lance.c
lantiq_etop.c
lasi_82596.c
lib8390.c	lib8390: Remove unnecessary extern	2011-06-24 17:31:37 -07:00
lib82596.c
LICENSE.SRC
ll_temac_main.c	net: include dma-mapping.h in ll_temac_main.c for dma_map_single etc	2011-06-29 02:55:59 -07:00
ll_temac_mdio.c
ll_temac.h
lne390.c
loopback.c
lp486e.c
mac89x0.c
mac8390.c
macb.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
macb.h
mace.c
mace.h
macmace.c
macsonic.c
macvlan.c	macvlan: do vlan cleanup	2011-07-21 13:47:58 -07:00
macvtap.c	macvtap: macvtapTX zero-copy support	2011-07-07 04:41:24 -07:00
Makefile	68360enet: Remove Kconfig/Makefile references	2011-07-16 12:35:27 -07:00
mdio.c
meth.c
meth.h
mii.c
mipsnet.c
mv643xx_eth.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
mvme147.c
natsemi.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
ne2.c
ne2k-pci.c
ne3210.c
ne-h8300.c
ne.c
netconsole.c
netx-eth.c
ni52.c
ni52.h
ni65.c
ni65.h
ni5010.c
ni5010.h
niu.c	niu: remove unnecessary read of PCI_CAP_ID_EXP	2011-06-27 21:40:45 -07:00
niu.h
ns83820.c	ns83820: do vlan cleanup	2011-07-21 13:47:56 -07:00
pasemi_mac_ethtool.c
pasemi_mac.c
pasemi_mac.h
pci-skeleton.c
pcnet32.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
plip.c	net: Push protocol type directly down to header_ops->cache()	2011-07-13 02:29:59 -07:00
ppp_async.c
ppp_deflate.c	net+crypto: Use vmalloc for zlib inflate buffers.	2011-06-29 05:48:41 -07:00
ppp_generic.c
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c
pppoe.c	pppoe: Must flush connections when MAC address changes too.	2011-07-18 11:48:28 -07:00
pppox.c
pptp.c	net: Remove unneeded version.h includes from drivers/net/	2011-06-24 02:40:08 -07:00
ps3_gelic_net.c	net/ps3: Fix gelic RX DMA restart	2011-07-14 16:03:29 -07:00
ps3_gelic_net.h	net/ps3: Fix gelic RX DMA restart	2011-07-14 16:03:29 -07:00
ps3_gelic_wireless.c
ps3_gelic_wireless.h
pxa168_eth.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
qla3xxx.c
qla3xxx.h
r6040.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-07-21 13:38:42 -07:00
r8169.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
rionet.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-07-05 23:23:37 -07:00
rrunner.c
rrunner.h
s2io-regs.h
s2io.c	s2io: do vlan cleanup	2011-07-21 13:47:55 -07:00
s2io.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
s6gmac.c
sb1000.c
sb1250-mac.c
sc92031.c
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
sh_eth.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-07-14 07:56:40 -07:00
sh_eth.h
sis190.c
sis900.c
sis900.h
skge.c	skge: update version	2011-07-07 00:30:09 -07:00
skge.h
sky2.c	sky2: version 1.29	2011-07-08 08:53:33 -07:00
sky2.h	sky2: support for new Optima chipsets (EXPERIMENTAL)	2011-07-08 08:53:33 -07:00
slhc.c
slip.c	slip: remove unused 'line' field from the 'slip' structure	2011-07-19 16:55:42 -07:00
slip.h	slip: remove unused 'line' field from the 'slip' structure	2011-07-19 16:55:42 -07:00
smc91x.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
smc91x.h
smc911x.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
smc911x.h
smc9194.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
smc9194.h
smc-mca.c
smc-ultra32.c
smc-ultra.c
smsc911x.c
smsc911x.h
smsc9420.c
smsc9420.h
sni_82596.c
sonic.c
sonic.h
Space.c
spider_net_ethtool.c
spider_net.c	spider_net: do not mention dying vlan_hwaccel_receive_skb	2011-07-21 13:47:55 -07:00
spider_net.h
starfire.c	starfire: do vlan cleanup	2011-07-21 13:47:56 -07:00
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
sunbmac.h
sundance.c
sungem_phy.c
sungem_phy.h
sungem.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
sungem.h
sunhme.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
sunhme.h
sunlance.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
sunqe.c	drivers/net: Omit check for multicast bit in netdev_for_each_mc_addr	2011-07-08 09:03:20 -07:00
sunqe.h
sunvnet.c
sunvnet.h
tc35815.c
tehuti.c	tehuti: do vlan cleanup	2011-07-21 13:47:55 -07:00
tehuti.h	tehuti: do vlan cleanup	2011-07-21 13:47:55 -07:00
tg3.c	tg3: Fix NVRAM selftest failures for 5720 devs	2011-07-21 12:36:15 -07:00
tg3.h	tg3: Fix link flap at 100Mbps with EEE enabled	2011-07-21 12:36:15 -07:00
tlan.c
tlan.h
tsi108_eth.c
tsi108_eth.h
tun.c
typhoon.c
typhoon.h
ucc_geth_ethtool.c
ucc_geth.c	net: ucc_geth: Omit check for multicast bit in netdev_for_each_mc_addr	2011-06-30 22:32:49 -07:00
ucc_geth.h
veth.c	veth: Kill unused tx_dropped	2011-07-06 01:51:04 -07:00
via-rhine.c
via-velocity.c	via-velocity: remove duplicated #include	2011-07-23 20:01:16 -07:00
via-velocity.h	via-velocity: do vlan cleanup	2011-07-21 13:47:56 -07:00
virtio_net.c	virtio_net: Fix panic in virtnet_remove	2011-07-21 21:29:34 -07:00
wd.c
xen-netfront.c
xilinx_emaclite.c
xtsonic.c
yellowfin.c
znet.c
zorro8390.c	zorro8390: Update style, neaten, restructure to eliminate prototypes	2011-06-24 17:31:37 -07:00