Linus Torvalds 72e58063d6 Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci ... * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (50 commits) davinci: fix remaining board support after io_pgoffst removal davinci: mityomapl138: make file local data static arm/davinci: remove duplicated include davinci: Initial support for Omapl138-Hawkboard davinci: MityDSP-L138/MityARM-1808 read MAC address from I2C Prom davinci: add tnetv107x touchscreen platform device input: add driver for tnetv107x touchscreen controller davinci: add keypad config for tnetv107x evm board davinci: add tnetv107x keypad platform device input: add driver for tnetv107x on-chip keypad controller net: davinci_emac: cleanup unused cpdma code net: davinci_emac: switch to new cpdma layer net: davinci_emac: separate out cpdma code net: davinci_emac: cleanup unused mdio emac code omap: cleanup unused davinci mdio arch code davinci: cleanup mdio arch code and switch to phy_id net: davinci_emac: switch to new mdio omap: add mdio platform devices davinci: add mdio platform devices net: davinci_emac: separate out davinci mdio ... Fix up trivial conflict in drivers/input/keyboard/Kconfig (two entries added next to each other - one from the davinci merge, one from the input merge)		2010-10-25 10:59:31 -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	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-27 01:03:03 -07:00
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	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
myri10ge	myri10ge: DCA update (resubmit)	2010-09-29 19:45:37 -07:00
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	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-04 11:56:38 -07:00
3c501.c
3c501.h
3c503.c
3c503.h
3c505.c
3c505.h
3c507.c
3c509.c
3c515.c	drivers/net: Use static const char * const where possible	2010-09-14 20:22:03 -07:00
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
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	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
bfin_mac.h
bmac.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
bmac.h
bnx2_fw.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
bsd_comp.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
cassini.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
cassini.h
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
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
cpmac.c
cs89x0.c
cs89x0.h
davinci_cpdma.c	net: davinci_emac: separate out cpdma code	2010-09-24 07:40:31 -07:00
davinci_cpdma.h	net: davinci_emac: separate out cpdma code	2010-09-24 07:40:31 -07:00
davinci_emac.c	net: davinci_emac: cleanup unused cpdma code	2010-09-24 07:40:31 -07:00
davinci_mdio.c	net: davinci_emac: separate out davinci mdio	2010-09-24 07:40:29 -07:00
de600.c
de600.h
de620.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
de620.h
declance.c
defxx.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
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	dummy: percpu stats and lockless xmit	2010-09-29 13:23:30 -07:00
e100.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
e2100.c
eepro.c
eexpress.c
eexpress.h
enc28j60_hw.h
enc28j60.c
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	drivers/net/eql.c: prevent reading uninitialized stack memory	2010-09-16 21:54:59 -07:00
es3210.c
eth16i.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
ethoc.c
ewrk3.c
ewrk3.h
fealnx.c
fec_mpc52xx_phy.c
fec_mpc52xx.c
fec_mpc52xx.h
fec.c	net: allow FEC driver to use fixed PHY support	2010-10-13 09:56:31 -07:00
fec.h
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	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
fsl_pq_mdio.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
gianfar.c	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
gianfar.h
greth.c
greth.h
hamachi.c
hp100.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
hp100.h
hp-plus.c
hp.c
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
Kconfig	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
korina.c
ks8842.c
ks8851_mll.c
ks8851.c
ks8851.h
ksz884x.c
lance.c
lasi_82596.c
lib8390.c
lib82596.c
LICENSE.SRC
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
ll_temac.h
lne390.c
loopback.c	net: add a core netdev->rx_dropped counter	2010-10-05 14:47:55 -07:00
lp486e.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
mac89x0.c
mac8390.c
macb.c
macb.h
mace.c
mace.h
macmace.c
macsonic.c
macvlan.c	netns: keep vlan slaves on master netns move	2010-09-17 16:46:04 -07:00
macvtap.c
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
mdio.c
meth.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
meth.h
mii.c
mipsnet.c
mv643xx_eth.c	mv643xx_eth: Use netif_set_real_num_{rx, tx}_queues()	2010-09-27 22:09:55 -07:00
mvme147.c
myri_sbus.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
myri_sbus.h
natsemi.c
ne2.c
ne2k-pci.c
ne3210.c
ne-h8300.c
ne.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_ethtool.c
pasemi_mac.c
pasemi_mac.h
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	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
plip.c	ipv4: ip_ptr cleanups	2010-09-15 22:06:05 -07:00
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	net: constify some ppp/pptp structs	2010-09-21 18:04:47 -07:00
pppox.c	net: constify some ppp/pptp structs	2010-09-21 18:04:47 -07:00
pptp.c	net: constify some ppp/pptp structs	2010-09-21 18:04:47 -07:00
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	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
ps3_gelic_wireless.h
pxa168_eth.c	net: pxa168_etc.c recognize additional contributors	2010-09-30 17:31:16 -07:00
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	rionet: use free_netdev(netdev) instead of kfree()	2010-09-26 18:54:33 -07:00
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: use free_netdev(netdev) instead of kfree()	2010-09-26 18:54:34 -07:00
sgiseeq.h
sh_eth.c
sh_eth.h
sis190.c
sis900.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
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	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
slip.h
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
smc-mca.c
smc-ultra32.c
smc-ultra.c
smsc911x.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-27 01:03:03 -07:00
smsc911x.h
smsc9420.c
smsc9420.h
sni_82596.c
sonic.c
sonic.h
Space.c
spider_net_ethtool.c
spider_net.c
spider_net.h
starfire.c
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
sunbmac.c
sunbmac.h
sundance.c	sundance: Add initial ethtool stats support	2010-10-16 11:13:21 -07:00
sungem_phy.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
sungem_phy.h
sungem.c
sungem.h
sunhme.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
sunhme.h
sunlance.c
sunqe.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
sunqe.h
sunvnet.c
sunvnet.h
tc35815.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
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	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
tsi108_eth.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
tsi108_eth.h
tun.c
typhoon.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
typhoon.h
ucc_geth_ethtool.c
ucc_geth.c
ucc_geth.h
veth.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
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	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
xilinx_emaclite.c
xtsonic.c
yellowfin.c
znet.c
zorro8390.c