aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2009-12-178-0/+1384
|\
| * NET: Add Ethernet driver for Octeon MGMT devices.David Daney2009-12-175-0/+1192
| * NET: Add driver for Octeon MDIO buses.David Daney2009-12-173-0/+192
* | Merge branch 'for-33' of git://repo.or.cz/linux-kbuildLinus Torvalds2009-12-171-1/+1
|\ \ | |/ |/|
| * net: fix for utsrelease.h moving to generatedStephen Rothwell2009-12-121-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-12-1625-741/+568
|\ \
| * | net: sh_eth alignment fix for sh7724 using NET_IP_ALIGN V2Magnus Damm2009-12-151-1/+6
| * | ixgbe: allow tx of pre-formatted vlan tagged packetsGurucharan Shetty2009-12-151-1/+12
| * | ixgbe: Fix 82598 premature copper PHY link indicatationMallikarjuna R Chilakala2009-12-152-0/+40
| * | ixgbe: Fix tx_restart_queue/non_eop_desc statistics countersMallikarjuna R Chilakala2009-12-151-2/+5
| * | bcm63xx_enet: fix compilation failure after get_stats_count removalFlorian Fainelli2009-12-151-3/+9
| * | sky2: leave PCI config space writeablestephen hemminger2009-12-141-13/+0
| * | sky2: print Optima chip namestephen hemminger2009-12-141-1/+1
| * | drivers/net/bonding/: : use pr_fmtJoe Perches2009-12-135-690/+465
| * | can: CAN_MCP251X should depend on HAS_DMAGeert Uytterhoeven2009-12-131-1/+1
| * | drivers/net/usb: Correct code taking the size of a pointerJulia Lawall2009-12-131-1/+1
| * | drivers/net/cpmac.c: Correct code taking the size of a pointerJulia Lawall2009-12-131-1/+1
| * | drivers/net/sfc: Correct code taking the size of a pointerJulia Lawall2009-12-131-1/+1
| * | 3c574_cs: disable irq before calling el3_interruptKen Kawasaki2009-12-132-0/+8
| * | mlx4_core: return a negative error valueroel kluin2009-12-131-1/+1
| * | can: Fix data length code handling in rx pathOliver Hartkopp2009-12-137-25/+17
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2009-12-161-1/+2
|\ \ \
| * | | mlx4_core: Fix parsing of reserved EQ capYevgeny Petrilin2009-11-121-1/+1
| * | | IB/mlx4: Remove limitation on LSO header sizeEli Cohen2009-11-121-0/+1
* | | | mlx4: use bitmap_find_next_zero_areaAkinobu Mita2009-12-161-33/+4
* | | | const: constify remaining dev_pm_opsAlexey Dobriyan2009-12-155-5/+5
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2009-12-145-5/+5
|\ \ \ \
| * | | | pcmcia: remove unused IRQ_FIRST_SHAREDDominik Brodowski2009-12-075-5/+5
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/...Linus Torvalds2009-12-143-8/+6
|\ \ \ \ \
| * | | | | this_cpu: Eliminate get/put_cpuChristoph Lameter2009-10-031-4/+3
| * | | | | this_cpu: Straight transformationsChristoph Lameter2009-10-032-4/+3
* | | | | | Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/...Linus Torvalds2009-12-121-1/+1
|\ \ \ \ \ \
| * | | | | | IXP4xx: Fix normally-disabled debugging text in drivers/net/arm/ixp4xx_eth.c.Krzysztof HaƂasa2009-12-051-1/+1
* | | | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2009-12-122-52/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit 'origin/master' into nextBenjamin Herrenschmidt2009-12-09725-56219/+68692
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'origin/master' into nextBenjamin Herrenschmidt2009-11-2432-251/+183
| |\ \ \ \ \ \ \ \
| * | | | | | | | | powerpc: Move ehea hcall definitions into hvcall.hAnton Blanchard2009-11-242-52/+0
* | | | | | | | | | Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2009-12-121-15/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | smc91x: remove OMAP specific bitsLadislav Michl2009-12-111-15/+0
* | | | | | | | | | be2net: fix error in rx completion processing.Ajit Khaparde2009-12-111-2/+2
* | | | | | | | | | igbvf: avoid reset storms due to mailbox issuesAlexander Duyck2009-12-112-1/+8
* | | | | | | | | | igb: fix handling of mailbox collisions between PF/VFAlexander Duyck2009-12-111-9/+13
* | | | | | | | | | usb: remove rare pm primitive for conversion to new APIOliver Neukum2009-12-111-2/+2
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/David S. Miller2009-12-1162-90/+93
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6Linus Torvalds2009-12-111-5/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | USB: remove the auto_pm flagAlan Stern2009-12-111-5/+2
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2009-12-111-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | xen: move Xen-testing predicates to common headerJeremy Fitzhardinge2009-11-041-0/+1
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2009-12-0960-85/+90
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'for-next' into for-linusJiri Kosina2009-12-0761-86/+91
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |