aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2010-10-269-9/+71
|\
| *-. Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iboe', 'ipoib', ...Roland Dreier2010-10-269-9/+71
| |\ \
| | | * mlx4_core: Allow log_mtts_per_seg up to 7Eli Cohen2010-09-281-2/+2
| | |/ | |/|
| | * IB/mlx4: Add VLAN support for IBoEEli Cohen2010-10-253-0/+30
| | * mlx4_en: Change multicast promiscuous mode to support IBoEEli Cohen2010-10-252-3/+4
| | * mlx4_core: Update data structures and constants for IBoEEli Cohen2010-10-251-1/+2
| | * mlx4_core: Allow protocol drivers to find corresponding interfacesEli Cohen2010-10-252-3/+33
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vap...Linus Torvalds2010-10-253-59/+96
|\ \
| * | netdev: bfin_mac: push settings to platform resourcesSonic Zhang2010-10-253-59/+96
* | | Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblazeLinus Torvalds2010-10-251-4/+4
|\ \ \
| * | | net: emaclite: Add support for little-endian platformsMichal Simek2010-10-211-4/+4
* | | | Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2010-10-256-1162/+1747
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'davinci-next' into davinci-for-linusKevin Hilman2010-10-216-1162/+1747
| |\ \ \
| | * | | net: davinci_emac: cleanup unused cpdma codeCyril Chemparathy2010-09-241-930/+0
| | * | | net: davinci_emac: switch to new cpdma layerCyril Chemparathy2010-09-241-85/+164
| | * | | net: davinci_emac: separate out cpdma codeCyril Chemparathy2010-09-244-0/+1084
| | * | | net: davinci_emac: cleanup unused mdio emac codeCyril Chemparathy2010-09-241-107/+0
| | * | | net: davinci_emac: switch to new mdioCyril Chemparathy2010-09-242-58/+31
| | * | | net: davinci_emac: separate out davinci mdioCyril Chemparathy2010-09-243-0/+486
| | | |/ | | |/|
* | | | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2010-10-2429-45/+43
|\ \ \ \
| * | | | Update broken web addresses in the kernel.Justin P. Mattock2010-10-1819-32/+30
| * | | | Revert "Fix typo: configuation => configuration" partiallyJiri Kosina2010-09-241-1/+1
| * | | | Fix typo configue => configure in commentsThomas Weber2010-09-231-1/+1
| * | | | Fix typo: configuation => configurationThomas Weber2010-09-233-5/+5
| * | | | Fix typo interrest[ing|ed] => interest[ing|ed]Thomas Weber2010-09-211-1/+1
| * | | | Merge branch 'master' into for-nextJiri Kosina2010-08-1084-956/+1286
| |\ \ \ \
| * | | | | fix printk typo 'faild'Paul Bolle2010-08-092-3/+3
| * | | | | Fix spelling fuction -> function in commentsStefan Weil2010-08-094-4/+4
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-10-23755-34219/+85444
|\ \ \ \ \ \
| * | | | | | bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.Jesse Gross2010-10-212-2/+2
| * | | | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-10-218-31/+56
| |\ \ \ \ \ \
| | * | | | | | r6040: Fix multicast filter some moreBen Hutchings2010-10-191-10/+12
| | * | | | | | gianfar: fix double lock typoDan Carpenter2010-10-181-1/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | cxgb3: function namespace cleanupstephen hemminger2010-10-217-289/+18
| * | | | | | be2net: Changes to use only priority codes allowed by f/wSomnath Kotur2010-10-214-10/+106
| * | | | | | can: mcp251x: fix generation of error framesMarc Kleine-Budde2010-10-211-1/+1
| * | | | | | can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is setMarc Kleine-Budde2010-10-211-5/+9
| * | | | | | drivers/net/ax88796.c: Return error code in failureJulia Lawall2010-10-211-0/+1
| * | | | | | b44: fix resume, request_irq after hw resetJames Hogan2010-10-211-5/+14
| * | | | | | cxgb4: function namespace cleanup (v3)stephen hemminger2010-10-216-455/+3
| * | | | | | phy/marvell: fix 88e1121 supportArnaud Patard2010-10-211-12/+19
| * | | | | | ixgbe: add a refcnt when turning on/off FCoE offload capabilityYi Zou2010-10-212-0/+7
| * | | | | | ixgbe: fix stats handlingEric Dumazet2010-10-213-16/+56
| * | | | | | ixgbe: update copyright infoEmil Tantilov2010-10-214-4/+4
| * | | | | | jme: Advance version numberGuo-Fu Tseng2010-10-212-1/+3
| * | | | | | jme: Adding mii-tool supportGuo-Fu Tseng2010-10-211-1/+33
| * | | | | | jme: Prevent possible read re-order errorGuo-Fu Tseng2010-10-211-0/+1
| * | | | | | jme: Add comment in jme_set_settingsGuo-Fu Tseng2010-10-211-3/+6
| * | | | | | jme: Fix PHY power-off errorGuo-Fu Tseng2010-10-211-4/+18
| * | | | | | bonding: cleanup: remove braces from single block statementsBandan Das2010-10-211-91/+72