aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6Linus Torvalds2009-10-1517-7/+32
|\
| * Staging: rt2860sta: prevent a panic when disabling when associatedDarren Salt2009-10-141-0/+2
| * staging: more sched.h fixesJeff Mahoney2009-10-144-0/+4
| * Staging: et131x: Fix the add_10bit macroAlan Cox2009-10-141-1/+1
| * Staging: et131x: Correct WRAP bit handlingAlan Cox2009-10-141-6/+14
| * staging: Complete sched.h removal from interrupt.hJeff Mahoney2009-10-143-0/+3
| * Staging: vme: fix sched.h build breakageGreg Kroah-Hartman2009-10-142-0/+2
| * Staging: poch: fix sched.h build breakageGreg Kroah-Hartman2009-10-141-0/+1
| * Staging: b3dfg: fix sched.h build breakageGreg Kroah-Hartman2009-10-141-0/+1
| * Staging: comedi: fix sched.h build breakageGreg Kroah-Hartman2009-10-143-0/+3
| * Staging: iio: Fix missing include <linux/sched.h>Jonathan Cameron2009-10-141-0/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-10-1580-345/+10844
|\ \
| * | vmxnet: fix 2 build problemsRandy Dunlap2009-10-142-2/+11
| * | net: add support for STMicroelectronics Ethernet controllers.Giuseppe Cavallaro2009-10-1416-0/+5178
| * | net: ks8851_mll uses mii interfacesRandy Dunlap2009-10-141-0/+1
| * | net/fec_mpc52xx: Fix kernel panic on FEC errorJohn Bonesio2009-10-141-6/+0
| * | net: Fix OF platform drivers coldplug/hotplug when compiled as modulesAnton Vorontsov2009-10-149-3/+10
| * | TI DaVinci EMAC: Clear statistics register properly.Sriram2009-10-131-12/+24
| * | r8169: partial support and phy init for the 8168dfrançois romieu2009-10-131-55/+932
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2009-10-136-4/+11
| |\ \
| | * | libertas: fix buildAlan Cox2009-10-121-0/+1
| | * | mac80211: document ieee80211_rx() context requirementJohannes Berg2009-10-122-0/+4
| | * | b43: fix ieee80211_rx() contextJohannes Berg2009-10-121-0/+3
| | * | mac80211: fix ibss raceJohannes Berg2009-10-121-1/+1
| | * | mac80211: fix logic error ibss merge bssid checkFelix Fietkau2009-10-121-1/+1
| | * | iwlwifi: change the order of freeing memoryWey-Yi Guy2009-10-122-2/+2
| * | | irda/sa1100_ir: check return value of startup hookDmitry Artamonow2009-10-131-2/+5
| * | | udp: Fix udp_poll() and ioctl()Eric Dumazet2009-10-131-30/+43
| * | | WAN: fix Cisco HDLC handshaking.Krzysztof Halasa2009-10-131-10/+8
| * | | tcp: fix tcp_defer_accept to consider the timeoutWilly Tarreau2009-10-131-0/+1
| * | | 3c574_cs: spin_lock the set_multicast_list functionKen Kawasaki2009-10-131-1/+12
| * | | net: Teach pegasus driver to ignore bluetoother adapters with clashing Vendor...Chris Rankin2009-10-132-1/+18
| * | | netxen: fix pci bar mappingDhananjay Phadke2009-10-131-1/+2
| * | | ethoc: fix warning from 32bit buildAlan Cox2009-10-131-1/+2
| * | | libertas: fix buildAlan Cox2009-10-131-0/+1
| * | | net: VMware virtual Ethernet NIC driver: vmxnet3Shreyas Bhatewara2009-10-139-0/+4193
| * | | net: Fix IXP 2000 network driver building.Vincent Sanders2009-10-132-17/+12
| * | | acenic: Pass up error code from ace_load_firmware()Ben Hutchings2009-10-121-1/+2
| * | | net: Fix struct sock bitfield annotationEric Dumazet2009-10-111-5/+5
| * | | pkt_sched: pedit use proper structjamal2009-10-111-1/+1
| * | | net: Add patchwork URL to MAINTAINERSEric Dumazet2009-10-111-0/+1
| |/ /
| * | net: Link in PHY drivers before others.David S. Miller2009-10-091-4/+4
| * | ibm_newemac: Added 16K Tx FIFO size support for EMAC4Dave Mitchell2009-10-082-2/+6
| * | qlge: Add disable/enable firmare irqs to handler.Ron Mercer2009-10-081-0/+4
| * | qlge: Restore rx mode after internal reset.Ron Mercer2009-10-081-0/+6
| * | qlge: Fix chip reset process.Ron Mercer2009-10-083-0/+106
| * | qlge: Fix RX multicast filter settings.Ron Mercer2009-10-081-10/+39
| * | qlge: Fix frame routing for multicast frames.Ron Mercer2009-10-081-2/+2
| * | qlge: Fix frame routing issue related to bonding.Ron Mercer2009-10-081-0/+7
| * | qlge: Fix RSS hashing values.Ron Mercer2009-10-082-11/+13