summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixesArnd Bergmann2012-07-251-0/+6
|\
| * ARM: Orion: fix driver probe error handling with respect to clkSimon Baatz2012-07-251-0/+6
* | sky2: Fix for interrupt handlerMirko Lindner2012-07-091-1/+3
* | sky2: Added support for Optima EEEMirko Lindner2012-07-092-1/+18
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-06-121-4/+6
|\ \ | |/
| * sky2: fix checksum bit management on some chipsstephen hemminger2012-06-071-4/+6
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-06-061-5/+10
|\ \ | |/
| * mv643xx_eth: Fix compile error for architectures without clk.Andrew Lunn2012-06-061-5/+10
* | ethernet: Remove casts to same typeJoe Perches2012-06-062-4/+4
|/
* Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-261-11/+31
|\
| * Merge branch 'clk-next' of git://git.linaro.org/people/mturquette/linux into ...Arnd Bergmann2012-05-161-11/+31
| |\
| | * ARM: Orion: Eth: Add clk/clkdev support.Andrew Lunn2012-05-081-11/+31
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-05-072-12/+20
|\ \ \ | |/ /
| * | sky2: fix receive length error in mixed non-VLAN/VLAN trafficstephen hemminger2012-05-012-12/+17
| * | sky2: propogate rx hash when packet is copiedstephen hemminger2012-05-011-0/+3
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-04-103-5/+15
|\ \ | |/
| * sky2: copy received packets on inefficient unaligned architecturestephen hemminger2012-04-041-1/+12
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-04-021-2/+3
| |\
| | * sky2: dont overwrite settings for PHY Quick linkLino Sanfilippo2012-04-021-2/+3
| * | Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-282-2/+0
| |\ \ | | |/ | |/|
| | * Remove all #inclusions of asm/system.hDavid Howells2012-03-282-2/+0
* | | pxa168_eth: Support the get_ts_info ethtool method.Richard Cochran2012-04-041-0/+1
* | | mv643xx_eth: Support the get_ts_info ethtool method.Richard Cochran2012-04-041-0/+1
* | | sky2: fix missing register reset on error path in sky2_test_msi()Lino Sanfilippo2012-04-031-2/+2
|/ /
* | sky2: override for PCI legacy power managementstephen hemminger2012-03-211-0/+11
|/
* pxa168: remove unused stats member.Rami Rosen2012-03-161-1/+0
* ethernet: unify return value of .ndo_set_mac_address if address is invalidDanny Kukawka2012-02-232-2/+2
* net: use eth_hw_addr_random() and reset addr_assign_typeDanny Kukawka2012-02-151-1/+2
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-02-101-58/+13
|\
| * Revert "skge: check for PCI dma mapping errors"stephen hemminger2012-02-071-58/+13
* | netdev: ethernet dev_alloc_skb to netdev_alloc_skbPradeep A Dalvi2012-02-062-2/+2
* | drivers/net: Remove alloc_etherdev error messagesJoe Perches2012-01-312-6/+2
* | drivers/net: Remove unnecessary k.alloc/v.alloc OOM messagesJoe Perches2012-01-311-6/+4
|/
* skge: add byte queue limit supportstephen hemminger2012-01-231-13/+24
* mv643xx_eth: Add Rx Discard and Rx Overrun statisticsPaulius Zaleckas2012-01-231-0/+14
* skge: check for PCI dma mapping errorsstephen hemminger2012-01-221-13/+58
* skge: don't assert carrier until link is upstephen hemminger2012-01-221-0/+1
* pxa168-eth: use an unique MDIO bus name.Florian Fainelli2012-01-101-1/+2
* mv643xx-eth: use an unique MDIO bus name.Florian Fainelli2012-01-101-1/+2
* 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
* | skge: fix warning when CONFIG_PM is defined but not CONFIG_PM_SLEEPDaniel Halperin2012-01-031-2/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-01-021-0/+3
|\ \
| * | skge: restore rx multicast filter on resume and after config changesFlorian Zumbiehl2011-12-301-0/+3
| |/
* | sky2: add bql supportstephen hemminger2011-11-291-5/+13
* | net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver()Axel Lin2011-11-291-12/+1
* | net: mv643xx_eth: fix build errorAxel Lin2011-11-241-4/+5
* | Sweep away N/A fw_version dustbunnies from the .get_drvinfo routine of a numb...Rick Jones2011-11-222-2/+0
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-11-212-38/+69
|\ \ | |/
| * sky2: fix hang in napi_disablestephen hemminger2011-11-172-7/+11
OpenPOWER on IntegriCloud