Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) Documentation/trace/events.txt: Remove obsolete sched_signal_send. writeback: fix global_dirty_limits comment runtime -> real-time ppc: fix comment typo singal -> signal drivers: fix comment typo diable -> disable. m68k: fix comment typo diable -> disable. wireless: comment typo fix diable -> disable. media: comment typo fix diable -> disable. remove doc for obsolete dynamic-printk kernel-parameter remove extraneous 'is' from Documentation/iostats.txt Fix spelling milisec -> ms in snd_ps3 module parameter description Fix spelling mistakes in comments Revert conflicting V4L changes i7core_edac: fix typos in comments mm/rmap.c: fix comment sound, ca0106: Fix assignment to 'channel'. hrtimer: fix a typo in comment init/Kconfig: fix typo anon_inodes: fix wrong function name in comment fix comment typos concerning "consistent" poll: fix a typo in comment ... Fix up trivial conflicts in: - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c) - fs/ext4/ext4.h Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.		2011-01-13 10:05:56 -08:00
..
appletalk
arcnet
arm	net: ixp4xx_eth: Return proper error for eth_init_one	2011-01-06 11:12:01 -08:00
atl1c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-26 22:37:05 -08:00
atl1e	net: Fix drivers advertising HW_CSUM feature to use csum_start	2010-12-16 14:43:15 -08:00
atlx	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-01-04 11:57:25 -08:00
benet	drivers/net/*/: Use static const	2010-12-21 02:16:10 -08:00
bna	bna: Update the driver version to 2.3.2.3	2010-12-25 19:16:03 -08:00
bnx2x	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
bonding	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
caif	Merge branch 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into devel-stable	2011-01-03 10:31:58 +00:00
can	pch_can: Fix array miss-pointing issue	2010-12-22 15:25:40 -08:00
chelsio	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
cris	net: cris/eth_v10: Use net_device_stats from struct net_device_stats	2010-12-06 13:24:47 -08:00
cxgb3	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
cxgb4	cxgb4: NUMA-aware Tx queue allocations	2010-12-16 13:16:04 -08:00
cxgb4vf	cxgb4vf: recover from failure in cxgb4vf_open()	2011-01-11 15:44:40 -08:00
e1000	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
e1000e	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
ehea	ehea: Increase the skb array usage	2011-01-11 14:03:09 -08:00
enic	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-17 12:27:22 -08:00
fs_enet	of/net: Move of_get_mac_address() to a common source file.	2010-11-01 01:08:14 -04:00
hamradio	hamradio: Resolve memory leak due to missing firmware release in add_mcs()	2011-01-09 15:45:48 -08:00
ibm_newemac	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
igb	igb: Add Anti-spoofing feature support	2010-12-24 21:36:51 -08:00
igbvf	igbvf: add support for i350 VF device	2010-12-24 21:38:47 -08:00
irda	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
ixgb	net: Fix drivers advertising HW_CSUM feature to use csum_start	2010-12-16 14:43:15 -08:00
ixgbe	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
ixgbevf	ixgbevf: Add X540 VF device support to the ixgbevf driver	2010-12-24 21:45:42 -08:00
ixp2000
mlx4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-01-11 16:32:41 -08:00
myri10ge	net: Fix drivers advertising HW_CSUM feature to use csum_start	2010-12-16 14:43:15 -08:00
netxen	netxen: update driver version 4.0.75	2011-01-03 11:56:18 -08:00
octeon
pch_gbe	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-08 13:47:38 -08:00
pcmcia	pcnet_cs: add new_id	2011-01-11 14:03:08 -08:00
phy	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-17 12:27:22 -08:00
qlcnic	qlcnic: change module parameter permissions	2011-01-10 13:34:55 -08:00
qlge	drivers/net/*/: Use static const	2010-12-21 02:16:10 -08:00
sfc	Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6	2010-12-21 12:17:29 -08:00
skfp	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-01-04 11:57:25 -08:00
stmmac	stmmac: unwind properly in stmmac_dvr_probe()	2010-12-21 10:53:19 -08:00
tile	drivers/net/tile/: on-chip network drivers for the tile architecture	2010-11-24 13:11:18 -05:00
tokenring	drivers/net/*/: Use static const	2010-12-21 02:16:10 -08:00
tulip	drivers/net/*/: Use static const	2010-12-21 02:16:10 -08:00
usb	USB: cdc_ether: remove unneeded check	2010-12-31 11:11:38 -08:00
vmxnet3	drivers/net/*/: Use static const	2010-12-21 02:16:10 -08:00
vxge	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
wan	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
wimax	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
wireless	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
3c59x.c	3c59x: fix build failure on !CONFIG_PCI	2010-11-18 10:47:42 -08:00
3c501.c	drivers/net/*.c: Use static const	2010-12-21 02:16:08 -08:00
3c501.h
3c503.c	drivers/net/*.c: Use static const	2010-12-21 02:16:08 -08:00
3c503.h
3c505.c
3c505.h
3c507.c	drivers/net/*.c: Use static const	2010-12-21 02:16:08 -08:00
3c509.c
3c515.c	drivers/net: normalize TX_TIMEOUT	2010-11-09 09:17:56 -08:00
3c523.c
3c523.h
3c527.c	drivers/net/*.c: Use static const	2010-12-21 02:16:08 -08:00
3c527.h
7990.c
7990.h
8139cp.c	8139cp: fix checksum broken	2010-11-17 12:21:14 -08:00
8139too.c	drivers/net: don't use flush_scheduled_work()	2010-12-12 16:45:14 +01:00
8390.c
8390.h
8390p.c
82596.c	drivers/net: normalize TX_TIMEOUT	2010-11-09 09:17:56 -08:00
a2065.c
a2065.h
ac3200.c
acenic.c
acenic.h
amd8111e.c
amd8111e.h
apne.c
ariadne.c
ariadne.h
at1700.c	drivers/net/*.c: Use static const	2010-12-21 02:16:08 -08:00
atarilance.c	drivers/net: normalize TX_TIMEOUT	2010-11-09 09:17:56 -08:00
atp.c
atp.h
au1000_eth.c	net: au1000_eth: remove unused global variable.	2010-12-11 12:01:48 -08:00
au1000_eth.h
ax88796.c	drivers/net: Remove unnecessary casts of netdev_priv	2010-11-17 10:37:52 -08:00
b44.c	b44: fix workarround for wap54g10	2010-12-01 11:11:31 -08:00
b44.h
bcm63xx_enet.c	drivers/net: don't use flush_scheduled_work()	2010-12-12 16:45:14 +01:00
bcm63xx_enet.h
bfin_mac.c	netdev: bfin_mac: let boards set vlan masks	2011-01-10 13:31:14 -08:00
bfin_mac.h	netdev: bfin_mac: let boards set vlan masks	2011-01-10 13:31:14 -08:00
bmac.c
bmac.h
bnx2_fw.h
bnx2.c	bnx2: Update firmware and version	2010-12-31 11:04:02 -08:00
bnx2.h	bnx2: Fix reset bug on 5709	2010-11-28 10:47:19 -08:00
bsd_comp.c
cassini.c	cassini: Use local-mac-address prom property for Cassini MAC address	2011-01-06 11:50:30 -08:00
cassini.h	cassini: Use local-mac-address prom property for Cassini MAC address	2011-01-06 11:50:30 -08:00
cnic_defs.h	cnic: Add FCoE support on 57712	2010-12-23 11:44:34 -08:00
cnic_if.h	cnic: Do not call bnx2i when bnx2i is calling cnic_unregister_driver()	2011-01-03 19:08:07 -08:00
cnic.c	cnic: Fix the type field in SPQ messages	2011-01-06 11:27:22 -08:00
cnic.h	cnic: Add FCoE support on 57712	2010-12-23 11:44:34 -08: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: Fix section mismatch derived from depca_isa_probe()	2011-01-03 13:27:38 -08:00
depca.h
dl2k.c
dl2k.h
dm9000.c	drivers/net: Remove unnecessary casts of netdev_priv	2010-11-17 10:37:52 -08:00
dm9000.h
dnet.c
dnet.h
dummy.c
e100.c
e2100.c	drivers/net/*.c: Use static const	2010-12-21 02:16:08 -08:00
eepro.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
eexpress.c	drivers/net/*.c: Use static const	2010-12-21 02:16:08 -08:00
eexpress.h
enc28j60_hw.h
enc28j60.c
epic100.c	epic100: hamachi: yellowfin: Fix skb allocation size	2010-12-25 19:37:49 -08:00
eql.c
es3210.c
eth16i.c
ethoc.c	ethoc: remove division from loops	2010-11-28 11:16:38 -08:00
ewrk3.c
ewrk3.h
fealnx.c
fec_mpc52xx_phy.c
fec_mpc52xx.c	mpc52xx: cleanup locking	2010-11-16 11:39:08 -08:00
fec_mpc52xx.h
fec.c	net/fec: add dual fec support for mx28	2011-01-09 15:42:56 -08:00
fec.h	net/fec: add dual fec support for mx28	2011-01-09 15:42:56 -08:00
forcedeth.c	forcedeth: Do not use legacy PCI power management	2011-01-09 16:20:29 -08:00
fsl_pq_mdio.c
fsl_pq_mdio.h
gianfar_ethtool.c	gianfar: Do not call device_set_wakeup_enable() under a spinlock	2010-11-12 14:05:43 -08:00
gianfar_sysfs.c
gianfar.c	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2011-01-10 08:57:03 -08:00
gianfar.h
greth.c
greth.h
hamachi.c	epic100: hamachi: yellowfin: Fix skb allocation size	2010-12-25 19:37:49 -08:00
hp-plus.c
hp.c	drivers/net/*.c: Use static const	2010-12-21 02:16:08 -08:00
hp100.c
hp100.h
hplance.c
hplance.h
hydra.c
ibmlana.c
ibmlana.h
ibmveth.c	netdev: Use default implementation of ethtool_ops::get_link where possible	2010-12-10 15:55:24 -08:00
ibmveth.h
ifb.c	ifb: add performance flags	2011-01-03 12:43:10 -08:00
ioc3-eth.c
ipg.c	ipg.c: remove id [SUNDANCE, 0x1021]	2010-11-18 10:45:24 -08:00
ipg.h
iseries_veth.c	iseries_veth: don't use flush_scheduled_work()	2010-12-12 16:45:14 +01:00
jazzsonic.c
jme.c	drivers/net/*.c: Use static const	2010-12-21 02:16:08 -08:00
jme.h
Kconfig	Merge branch 'stable/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-01-12 08:37:35 -08:00
korina.c
ks8842.c
ks8851_mll.c
ks8851.c	ks8851: suspend resume support	2010-11-08 13:50:06 -08:00
ks8851.h
ksz884x.c	ksz884x: Fix section mismatch derived from pcidev_init()	2011-01-03 13:27:37 -08:00
lance.c	drivers/net: normalize TX_TIMEOUT	2010-11-09 09:17:56 -08:00
lasi_82596.c
lib8390.c	drivers/net: Remove unnecessary casts of netdev_priv	2010-11-17 10:37:52 -08:00
lib82596.c	drivers/net: normalize TX_TIMEOUT	2010-11-09 09:17:56 -08:00
LICENSE.SRC
ll_temac_main.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
ll_temac_mdio.c
ll_temac.h
lne390.c
loopback.c
lp486e.c
mac89x0.c
mac8390.c
macb.c	macb: Don't re-enable interrupts while in polling mode	2010-10-25 12:14:11 -07:00
macb.h
mace.c
mace.h
macmace.c
macsonic.c
macvlan.c	macvlan: Introduce 'passthru' mode to takeover the underlying device	2010-11-22 08:24:29 -08:00
macvtap.c	net: Use skb_checksum_start_offset()	2010-12-16 14:43:14 -08:00
Makefile	drivers/net/tile/: on-chip network drivers for the tile architecture	2010-11-24 13:11:18 -05:00
mdio.c
meth.c
meth.h
mii.c
mipsnet.c
mv643xx_eth.c	drivers/net: don't use flush_scheduled_work()	2010-12-12 16:45:14 +01:00
mvme147.c
myri_sbus.c
myri_sbus.h
natsemi.c
ne-h8300.c	drivers/net: Remove unnecessary casts of netdev_priv	2010-11-17 10:37:52 -08:00
ne.c
ne2.c
ne2k-pci.c
ne3210.c
netconsole.c	netconsole: clarify stopping message	2011-01-06 11:30:23 -08:00
netx-eth.c
ni52.c	drivers/net/*.c: Use static const	2010-12-21 02:16:08 -08:00
ni52.h
ni65.c	drivers/net/*.c: Use static const	2010-12-21 02:16:08 -08:00
ni65.h
ni5010.c
ni5010.h
niu.c	net: Fix drivers advertising HW_CSUM feature to use csum_start	2010-12-16 14:43:15 -08:00
niu.h
ns83820.c
pasemi_mac_ethtool.c
pasemi_mac.c
pasemi_mac.h
pci-skeleton.c
pcnet32.c
plip.c
ppp_async.c	net: ppp: use {get,put}_unaligned_be{16,32}	2011-01-10 16:13:33 -08:00
ppp_deflate.c	net: ppp: use {get,put}_unaligned_be{16,32}	2011-01-10 16:13:33 -08:00
ppp_generic.c	net: ppp: use {get,put}_unaligned_be{16,32}	2011-01-10 16:13:33 -08:00
ppp_mppe.c	net: ppp: use {get,put}_unaligned_be{16,32}	2011-01-10 16:13:33 -08:00
ppp_mppe.h
ppp_synctty.c	net: ppp: use {get,put}_unaligned_be{16,32}	2011-01-10 16:13:33 -08:00
pppoe.c	pppoe.c: Fix kernel panic caused by __pppoe_xmit	2010-12-12 15:06:16 -08:00
pppox.c
pptp.c	ipv4: Don't pre-seed hoplimit metric.	2010-12-12 22:08:17 -08:00
ps3_gelic_net.c
ps3_gelic_net.h
ps3_gelic_wireless.c
ps3_gelic_wireless.h
pxa168_eth.c	drivers/net: don't use flush_scheduled_work()	2010-12-12 16:45:14 +01:00
qla3xxx.c	drivers/net/qla3xxx.c: Remove unnecessary casts of netdev_priv	2010-11-17 10:36:51 -08:00
qla3xxx.h
r6040.c	net: r6040: Return proper error for r6040_init_one	2011-01-06 11:18:07 -08:00
r8169.c	net/r8169: Update the function of parsing firmware	2011-01-10 16:13:33 -08:00
rionet.c
rrunner.c
rrunner.h
s2io-regs.h
s2io.c	drivers/net: don't use flush_scheduled_work()	2010-12-12 16:45:14 +01:00
s2io.h	s2io: make strings at tables const	2010-12-11 11:46:36 -08:00
s6gmac.c
sb1000.c	drivers/net/sb1000.c: delete double assignment	2010-10-27 12:23:20 -07:00
sb1250-mac.c
sc92031.c	net: Fix too optimistic NETIF_F_HW_CSUM features	2010-12-06 12:59:04 -08:00
seeq8005.c
seeq8005.h
sgiseeq.c	drivers/net: sgiseeq: fix return on error	2010-10-26 10:02:13 -07:00
sgiseeq.h
sh_eth.c	drivers/net: remove unnecessary flush_scheduled_work() calls	2010-12-12 16:45:14 +01:00
sh_eth.h	drivers/net: remove unnecessary flush_scheduled_work() calls	2010-12-12 16:45:14 +01:00
sis190.c	drivers/net: don't use flush_scheduled_work()	2010-12-12 16:45:14 +01:00
sis900.c	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
sis900.h
skge.c	skge: Do not use legacy PCI power management	2010-12-31 12:50:18 -08:00
skge.h
sky2.c	sky2: convert to new VLAN model (v0.2)	2011-01-09 15:54:15 -08:00
sky2.h	sky2: convert to new VLAN model (v0.2)	2011-01-09 15:54:15 -08:00
slhc.c	slhc: Don't export symbols twice	2010-10-24 16:25:39 -07:00
slip.c
slip.h
smc-mca.c
smc-ultra.c	drivers/net/*.c: Use static const	2010-12-21 02:16:08 -08:00
smc-ultra32.c
smc91x.c
smc91x.h
smc911x.c
smc911x.h
smc9194.c
smc9194.h
smsc911x.c	MN10300: ASB2364: Add support for SMSC911X and SMC911X	2010-10-27 17:28:58 +01:00
smsc911x.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-11-05 15:25:48 -07:00
smsc9420.c
smsc9420.h
sni_82596.c
sonic.c
sonic.h
Space.c	net/Space: delete orphaned externs from deleted drivers	2011-01-03 11:06:35 -08:00
spider_net_ethtool.c
spider_net.c
spider_net.h
starfire.c	starfire: Fix dma_addr_t size test for MIPS	2010-12-31 12:33:17 -08:00
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c
sunbmac.h
sundance.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-26 22:37:05 -08:00
sungem_phy.c
sungem_phy.h
sungem.c	net: Fix drivers advertising HW_CSUM feature to use csum_start	2010-12-16 14:43:15 -08:00
sungem.h
sunhme.c	net: Fix drivers advertising HW_CSUM feature to use csum_start	2010-12-16 14:43:15 -08:00
sunhme.h
sunlance.c	netdev: Use default implementation of ethtool_ops::get_link where possible	2010-12-10 15:55:24 -08:00
sunqe.c
sunqe.h
sunvnet.c
sunvnet.h
tc35815.c
tehuti.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
tehuti.h
tg3.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-01-04 11:57:25 -08:00
tg3.h	tg3: Relax EEE thresholds	2010-12-06 11:03:48 -08:00
tlan.c
tlan.h
tsi108_eth.c
tsi108_eth.h
tun.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
typhoon.c	typhoon: memory corruption in typhoon_get_drvinfo()	2010-12-20 10:43:02 -08:00
typhoon.h
ucc_geth_ethtool.c
ucc_geth.c	Merge commit 'v2.6.37-rc7' into devicetree/next	2010-12-23 00:41:14 -07:00
ucc_geth.h	ucc_geth: fix ucc halt problem in half duplex mode	2010-11-28 18:36:57 -08:00
veth.c	net/veth: Fix packet checksumming	2010-12-16 14:41:35 -08:00
via-rhine.c	via-rhine: hardware VLAN support	2010-12-08 10:23:36 -08:00
via-velocity.c	fix comment typos concerning "consistent"	2010-12-10 16:04:28 +01:00
via-velocity.h
virtio_net.c	net: Use skb_checksum_start_offset()	2010-12-16 14:43:14 -08:00
wd.c	drivers/net/*.c: Use static const	2010-12-21 02:16:08 -08:00
xen-netfront.c	net offloading: Pass features into netif_needs_gso().	2011-01-09 23:35:34 -08:00
xilinx_emaclite.c	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2011-01-10 08:57:03 -08:00
xtsonic.c
yellowfin.c	epic100: hamachi: yellowfin: Fix skb allocation size	2010-12-25 19:37:49 -08:00
znet.c	drivers/net: normalize TX_TIMEOUT	2010-11-09 09:17:56 -08:00
zorro8390.c