summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-01-0910-13/+11
|\
| * netdev: make net_device_ops conststephen hemminger2012-01-092-3/+2
| * bcm63xx: make ethtool_ops conststephen hemminger2012-01-091-1/+1
| * usbnet: make ethtool_ops conststephen hemminger2012-01-094-5/+5
| * 8139cp: fix missing napi_gro_flush.françois romieu2012-01-081-0/+1
| * smsc911x: Unconditionally include linux/smscphy.h in smsc911x.hDavid S. Miller2012-01-071-2/+0
| * asix: fix infinite loop in rx_fixup()Aurelien Jacobs2012-01-071-1/+1
| * r6040: fix typo in use of MCR0 register bitsCesar Eduardo Barros2012-01-071-1/+1
* | Merge tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-092-10/+10
|\ \
| * \ Merge branch 'mxs/clk-prepare' of git://git.linaro.org/people/shawnguo/linux-...Arnd Bergmann2012-01-032-10/+10
| |\ \
| | * | net: flexcan: convert to clk_prepare/clk_unprepareShawn Guo2011-12-281-5/+5
| | * | net: fec: add clk_prepare/clk_unprepareRichard Zhao2011-12-281-5/+5
* | | | Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-095-60/+402
|\ \ \ \
| * \ \ \ Merge branch 'samsung/driver' into next/driversArnd Bergmann2012-01-0911-20/+36
| |\ \ \ \
| | * \ \ \ Merge branch 'next/cleanup' into samsung/dtArnd Bergmann2012-01-073-93/+67
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'v3.2-rc6' into next/driversArnd Bergmann2011-12-278-57/+21
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'omap/hwmod' into next/driversArnd Bergmann2011-12-2733-145/+305
| |\ \ \ \ \ \
| * | | | | | | net: macb: fix build break with !CONFIG_OFOlof Johansson2011-12-211-0/+1
| * | | | | | | Merge branch 'at91/macb' into next/driversArnd Bergmann2011-12-163-18/+80
| |\ \ \ \ \ \ \
| | * | | | | | | net/at91_ether: use gpio_is_valid for phy IRQ lineNicolas Ferre2011-12-161-10/+13
| | * | | | | | | net/macb: add DT support for Cadence macb/gem driverJean-Christophe PLAGNIOL-VILLARD2011-12-162-8/+67
| * | | | | | | | Merge branch 'mxs/saif' into next/driversArnd Bergmann2011-12-0640-191/+410
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | macb: allow GEM to have configurable receive buffer sizeJamie Iles2011-11-222-0/+22
| * | | | | | | | macb: support DMA bus widths > 32 bitsJamie Iles2011-11-222-0/+42
| * | | | | | | | macb: support statistics for GEM devicesJamie Iles2011-11-222-4/+107
| * | | | | | | | macb: support higher rate GEM MDIO clock divisorsJamie Iles2011-11-222-11/+55
| * | | | | | | | macb: initial support for Cadence GEMJamie Iles2011-11-224-27/+95
* | | | | | | | | Merge tag 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-091-4/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ARM: Orion: Get address map from plat-orion instead of via platform_dataAndrew Lunn2011-12-131-4/+6
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-093-93/+67
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge branch 'depends/rmk/restart' into next/cleanupArnd Bergmann2012-01-0717-77/+53
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'at91/defconfig' into next/cleanupOlof Johansson2011-12-1534-146/+307
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'drivers/macb-gem-cleanup' into at91/gpioArnd Bergmann2011-11-293-93/+67
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | macb: convert printk to netdev_ and friendsJamie Iles2011-11-221-64/+56
| | * | | | | | | macb: unify at91 and avr32 platform dataJamie Iles2011-11-223-8/+9
| | * | | | | | | macb: remove conditional clk handlingJamie Iles2011-11-221-21/+2
* | | | | | | | | Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-01-098-0/+3434
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | net/hyperv: Add support for jumbo frame up to 64KBHaiyang Zhang2012-01-043-17/+67
| * | | | | | | | | net/hyperv: Add NETVSP protocol version negotiationHaiyang Zhang2012-01-042-34/+149
| * | | | | | | | | net/hyperv: Remove unnecessary kmap_atomic in netvsc driverHaiyang Zhang2012-01-044-92/+10
| * | | | | | | | | Merge 3.2-rc5 into staging-nextGreg Kroah-Hartman2011-12-098-0/+3351
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | net/hyperv: Fix the stop/wake queue mechanismHaiyang Zhang2011-12-092-26/+12
| | * | | | | | | | net/hyperv: Add support for promiscuous mode settingHaiyang Zhang2011-12-013-25/+68
| | * | | | | | | | net/hyperv: Fix long lines in netvsc.cHaiyang Zhang2011-12-011-3/+5
| | * | | | | | | | staging: hv: move hv_netvsc out of staging areaHaiyang Zhang2011-11-298-0/+3320
| | |/ / / / / / /
* | | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-01-087-9/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sis900: Fix enum typo 'sis900_rx_bufer_status'Paul Bolle2011-12-061-1/+1
| * | | | | | | | | treewide: Fix comment and string typo 'bufer'Paul Bolle2011-12-061-1/+1
| * | | | | | | | | treewide: Fix typos in various parts of the kernel, and fix some comments.Justin P. Mattock2011-12-025-7/+7
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-01-081-1/+1
|\ \ \ \ \ \ \ \ \
OpenPOWER on IntegriCloud