linux/drivers/net/ethernet
Linus Torvalds ca90666287 Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
* 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)
  ARM: 7135/1: ep93xx: bring back missing <mach/gpio.h>
  ARM: 7104/1: plat-pxa: break out GPIO driver specifics
  ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
  ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
  ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>
  ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
  ARM: 7083/1: rewrite U300 GPIO to use gpiolib
  ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
  ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
  ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
  ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
  ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
  ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
  ARM: 7057/1: mach-pnx4008: rename GPIO header
  ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h>
  ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
  ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
  ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
  ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
  ARM: 7043/1: mach-ixp2000: rename GPIO header
  ...

Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually
2011-10-27 08:39:10 +02:00
..
3com net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
8390
adaptec net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
adi
aeroflex net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
alteon net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
amd
apple cs89x0: Move the driver into the Cirrus dir 2011-10-18 23:41:43 -04:00
atheros Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2011-10-25 13:25:22 +02:00
broadcom Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2011-10-25 13:25:22 +02:00
brocade net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
cadence Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-27 08:39:10 +02:00
chelsio cxgb4vf: convert to SKB paged frag API. 2011-10-21 02:52:52 -04:00
cirrus cs89x0: Move the driver into the Cirrus dir 2011-10-18 23:41:43 -04:00
cisco net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
davicom
dec Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2011-10-25 13:25:22 +02:00
dlink
emulex be2net: don't create multiple RX/TX rings in multi channel mode 2011-10-24 18:40:14 -04:00
faraday ftmac100: fix skb truesize underestimation 2011-10-13 22:28:29 -04:00
freescale
fujitsu
hp
i825xx
ibm ehea: fix skb_frag_size typo 2011-10-25 16:20:43 +02:00
icplus
intel Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 2011-10-25 15:18:39 +02:00
marvell Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2011-10-25 13:25:22 +02:00
mellanox Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-10-24 18:18:09 -04:00
micrel Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2011-10-25 13:25:22 +02:00
microchip
myricom myri10ge: fix truesize underestimation 2011-10-20 17:04:20 -04:00
natsemi net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
neterion net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
nuvoton
nvidia net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
octeon
oki-semi net: Remove unnecessary driver assignments of ethtool_ringparam fields to zero 2011-10-07 19:13:28 -04:00
packetengines
pasemi net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
qlogic net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
racal
rdc r6040: bump version to 0.28 and date to 07Oct2011. 2011-10-09 23:50:59 -04:00
realtek Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-10-24 18:18:09 -04:00
renesas
seeq
sfc net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
sgi
sis
smsc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2011-10-25 13:25:22 +02:00
stmicro stmmac: limit max_mtu in case of 4KiB and use __netdev_alloc_skb (V2) 2011-10-19 19:24:18 -04:00
sun net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
tehuti net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
ti
tile Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2011-10-25 13:25:22 +02:00
toshiba
tundra net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
via net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
xilinx ll_temac: Add support for ethtool 2011-10-20 17:10:55 -04:00
xircom
xscale
dnet.c
dnet.h
ethoc.c
fealnx.c
jme.c Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-10-24 18:18:09 -04:00
jme.h
Kconfig
korina.c
lantiq_etop.c
Makefile
mipsnet.c
netx-eth.c
s6gmac.c