summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2Ingo Molnar2009-03-274-20/+28
|\
| *-----. Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x...Ingo Molnar2009-03-0421-139/+285
| |\ \ \ \
| | | * \ \ Merge branch 'x86/urgent' into x86/patIngo Molnar2009-03-011-4/+4
| | | |\ \ \ | | |/ / / / | |/| | | |
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Merge branches 'x86/apic', 'x86/defconfig', 'x86/memtest', 'x86/mm' and 'linu...Ingo Molnar2009-02-2621-19/+5163
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | | | | | |
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *-----. \ \ \ \ \ Merge branches 'x86/acpi', 'x86/apic', 'x86/cpudetect', 'x86/headers', 'x86/p...Ingo Molnar2009-02-1728-8955/+8879
| |\ \ \ \ \ \ \ \ \
| | | | | \ \ \ \ \ \
| | | | | \ \ \ \ \ \
| | | | | \ \ \ \ \ \
| | | | | \ \ \ \ \ \
| | | | | \ \ \ \ \ \
| | | | | \ \ \ \ \ \
| | | | | \ \ \ \ \ \
| | | | | \ \ \ \ \ \
| | | | | \ \ \ \ \ \
| | | | | \ \ \ \ \ \
| | | | | \ \ \ \ \ \
| | | | | \ \ \ \ \ \
| | | | *-----------. \ \ \ \ \ \ Merge branches 'x86/acpi', 'x86/asm', 'x86/cpudetect', 'x86/crashdump', 'x86/...Ingo Molnar2009-02-133-15/+16
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | / / / / / | | | | | | | | | |_|_|/ / / / / | | | | | | | | |/| | | | | / / | | | | | | |_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | |
| | | | | | | | | * | | | | | arlan-main.c fix compilation warnings for phys_addr_tJaswinder Singh Rajput2009-02-111-2/+2
| | | | | | | | | * | | | | | ne3210.c fix compilation warning for phys_addr_tJaswinder Singh Rajput2009-02-111-1/+2
| | | | | | | | | * | | | | | falcon fix compilation warningsJaswinder Singh Rajput2009-02-111-12/+12
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge commit 'v2.6.29-rc5' into x86/apicIngo Molnar2009-02-1517-8887/+8751
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'linus' into x86/apicIngo Molnar2009-02-1327-83/+159
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'x86/urgent' into x86/apicIngo Molnar2009-02-0536-364/+409
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'core/percpu' into x86/coreIngo Molnar2009-01-281-5/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'linus' into core/percpuIngo Molnar2009-01-2744-386/+582
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch 'x86/mm' into core/percpuIngo Molnar2009-01-2154-581/+797
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \ \
| | | *-. \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'cpus4096', 'x86/cleanups' and 'x86/urgent' into x86/percpuIngo Molnar2009-01-151-5/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / / / / / | | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | | cpumask: convert drivers/net/sfcRusty Russell2009-01-111-4/+11
| | | | * | | | | | | | | | | | | cpumask: Use topology_core_cpumask()/topology_thread_cpumask()Rusty Russell2009-01-111-2/+2
| | | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6Linus Torvalds2009-03-261-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Rationalize fasync return valuesJonathan Corbet2009-03-161-2/+2
* | | | | | | | | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2009-03-26631-78304/+87218
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /home/davem/src/GIT/linux-2.6/David S. Miller2009-03-262-14/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2009-03-262-0/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | dnet: drivers/net/dnet.c needs <linux/io.h>Geert Uytterhoeven2009-03-241-0/+1
| | * | | | | | | | | | | | | | | | | | phy: add new LAN8710 and LAN8720 device ids to smsc phy driverSteve Glendinning2009-03-231-0/+31
| * | | | | | | | | | | | | | | | | | | ixgbe: Allow Priority Flow Control settings to survive a device resetPJ Waskiewicz2009-03-265-6/+26
| * | | | | | | | | | | | | | | | | | | e1000e: update version numberJesse Brandeburg2009-03-261-1/+1
| * | | | | | | | | | | | | | | | | | | e1000e: fix close interrupt raceJesse Brandeburg2009-03-261-6/+10
| * | | | | | | | | | | | | | | | | | | e1000e: fix loss of multicast packetsJesse Brandeburg2009-03-261-44/+18
| * | | | | | | | | | | | | | | | | | | e1000e: commonize tx cleanup routine to match e1000 & igbAlexander Duyck2009-03-261-11/+8
| * | | | | | | | | | | | | | | | | | | e1000: fix close race with interruptJesse Brandeburg2009-03-261-4/+24
| * | | | | | | | | | | | | | | | | | | e1000: cleanup clean_tx_irq routine so that it completely cleans ringAlexander Duyck2009-03-261-12/+9
| * | | | | | | | | | | | | | | | | | | e1000: fix tx hang detect logic and address dma mapping issuesAlexander Duyck2009-03-261-25/+30
| * | | | | | | | | | | | | | | | | | | bonding: select current active slave when enslaving device for mode tlb and albJiri Pirko2009-03-251-0/+1
| * | | | | | | | | | | | | | | | | | | gianfar: reallocate skb when headroom is not enough for fcbLi Yang2009-03-251-10/+21
| * | | | | | | | | | | | | | | | | | | Bump release date to 25Mar2009 and version to 0.22Florian Fainelli2009-03-251-2/+2
| * | | | | | | | | | | | | | | | | | | r6040: Fix second PHY addressFlorian Fainelli2009-03-251-1/+1
| * | | | | | | | | | | | | | | | | | | rndis_wlan: Fix build with netdev_ops compat disabled.David S. Miller2009-03-251-1/+13
| * | | | | | | | | | | | | | | | | | | ax88796: Add method to take MAC from platform dataDaniel Mack2009-03-241-5/+12
| * | | | | | | | | | | | | | | | | | | drivers/net/ax88796.c: take IRQ flags from platform_deviceDaniel Mack2009-03-241-5/+9
| * | | | | | | | | | | | | | | | | | | e1000e: add support for 82574 device ID 0x10F6Bruce Allan2009-03-242-0/+2
| * | | | | | | | | | | | | | | | | | | be2net: cleanup rx/tx rate calculationsSathya Perla2009-03-242-36/+72
| * | | | | | | | | | | | | | | | | | | myri10ge: update firmware headers to 1.4.41Brice Goglin2009-03-241-0/+9
| * | | | | | | | | | | | | | | | | | | macb: fix warning "warning: unused variable `dev' "vibi sreenivasan2009-03-241-1/+0
| * | | | | | | | | | | | | | | | | | | ucc_geth: Convert to net_device_opsJoakim Tjernlund2009-03-241-9/+15
| * | | | | | | | | | | | | | | | | | | ucc_geth: Fix build breakage caused by a mergeAnton Vorontsov2009-03-241-1/+1
| * | | | | | | | | | | | | | | | | | | ucc_geth: Fix merge error.David S. Miller2009-03-231-5/+0
| * | | | | | | | | | | | | | | | | | | fsl_pq_mdio: Use proper address translationAnton Vorontsov2009-03-231-3/+7
| * | | | | | | | | | | | | | | | | | | spider_net: Add missing .ndo_validate_addrDavid S. Miller2009-03-231-0/+1
| * | | | | | | | | | | | | | | | | | | myri_sbus/sunbmac/sunlance/sunqe: Add missing net_device_ops entries.David S. Miller2009-03-234-0/+11
OpenPOWER on IntegriCloud