summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* e1000: remove leading and trailing whitespace.Auke Kok2006-05-234-81/+81
* e1000: remove backslash r debug printfsAuke Kok2006-05-231-12/+12
* e1000: add shutdown handler back to fix WOLAuke Kok2006-05-231-1/+9
* Merge branch 'upstream-fixes' into upstreamJeff Garzik2006-05-208-302/+131
|\
| * [PATCH] winbond-840-remove-badness-in-pci_map_singleErling A. Jacobsen2006-05-201-2/+2
| * [PATCH] network: axnet_cs: bug fix multicast code (support older ax88190 chip...Komuro2006-05-201-11/+2
| * [PATCH] skge: don't allow transmit ring to be too smallStephen Hemminger2006-05-201-1/+1
| * [PATCH] skge: bad checksums on big-endian platformsStephen Hemminger2006-05-201-2/+1
| * Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Jeff Garzik2006-05-201-3/+3
| |\
| | * [PATCH] bcm43xx: associate on 'ifconfig up'David Woodhouse2006-05-171-3/+3
| * | [PATCH] sky2 version 1.4Stephen Hemminger2006-05-201-1/+1
| * | [PATCH] sky2: force NAPI repoll if busyStephen Hemminger2006-05-201-5/+11
| * | [PATCH] sky2: more fixes for Yukon UltraStephen Hemminger2006-05-202-1/+4
| * | [PATCH] Subjec: sky2, skge: correct PCI id for DGE-560TStephen Hemminger2006-05-202-2/+2
| * | [PATCH] sky2: allow dual port usageStephen Hemminger2006-05-201-15/+17
| * | [PATCH] via-rhine: revert "change mdelay to msleep and remove from ISR path"John W. Linville2006-05-201-31/+3
| * | [PATCH] revert "forcedeth: fix multi irq issues"Andrew Morton2006-05-201-228/+84
* | | Merge branch 'master' into upstreamJeff Garzik2006-05-20386-3231/+7448
|\ \ \ | |/ /
| * | Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/rolan...Linus Torvalds2006-05-194-24/+27
| |\ \
| | * | IB/mthca: Fix posting lists of 256 receive requests for TavorMichael S. Tsirkin2006-05-181-17/+18
| | * | IB/uverbs: Don't leak ref to mm on error pathRoland Dreier2006-05-171-1/+3
| | * | IB/srp: Complete correct SCSI commands on device resetIshai Rabinovitz2006-05-171-1/+1
| | * | IB/srp: Get rid of extra scsi_host_put()s if reconnection failsRoland Dreier2006-05-171-3/+0
| | * | IB/srp: Don't wait for disconnection if sending DREQ failsRoland Dreier2006-05-171-1/+4
| | * | IB/mthca: Make fw_cmd_doorbell default to 0Roland Dreier2006-05-171-1/+1
| * | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-05-196-109/+168
| |\ \ \
| | * | | [SCTP]: Allow linger to abort 1-N style sockets.Vladislav Yasevich2006-05-191-6/+6
| | * | | [SCTP]: Validate the parameter length in HB-ACK chunk.Vladislav Yasevich2006-05-191-0/+6
| | * | | [SCTP]: Respect the real chunk length when walking parameters.Vladislav Yasevich2006-05-191-3/+3
| | * | | [SCTP]: A better solution to fix the race between sctp_peeloff() andVladislav Yasevich2006-05-192-67/+89
| | * | | [SCTP]: Set sk_err so that poll wakes up after a non-blocking connect failure.Sridhar Samudrala2006-05-195-33/+64
| * | | | Merge master.kernel.org:/home/rmk/linux-2.6-mmcLinus Torvalds2006-05-197-19/+26
| |\ \ \ \
| | * | | | [ARM] 3531/1: i.MX/MX1 SD/MMC ensure, that clock are stopped before new comma...Pavel Pisa2006-05-197-19/+26
| * | | | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2006-05-193-5/+12
| |\ \ \ \ \
| | * | | | | [ARM] 3533/1: Implement the __raw_(read|write)_can_lock functions on ARMCatalin Marinas2006-05-191-0/+6
| | * | | | | [ARM] 3530/1: PXA Mainstone: prevent double enable_irq() in pcmciaThomas Gleixner2006-05-171-1/+4
| | * | | | | [ARM] 3529/1: s3c24xx: fix restoring control register with undefined instructionDimitry Andric2006-05-171-4/+2
| | | |_|_|/ | | |/| | |
| * | | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds2006-05-194-12/+15
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | [WATCHDOG] s3c2410_wdt.c stop watchdog after bootBen Dooks2006-05-151-0/+6
| | * | | | [WATCHDOG] i8xx_tco.c - remove support for ICH6 + ICH7Wim Van Sebroeck2006-05-151-11/+5
| | * | | | [WATCHDOG] Documentation/watchdog/watchdog-api.txt - fix watchdog daemonRandy Dunlap2006-05-151-0/+3
| | * | | | [WATCHDOG] sc1200wdt.c printk fixDave Jones2006-05-151-1/+1
| * | | | | [NETFILTER]: nfnetlink_log: fix byteorder confusionPatrick McHardy2006-05-191-2/+2
| * | | | | [NETFILTER]: Fix do_add_counters race, possible oops or info leak (CVE-2006-0...Solar Designer2006-05-192-2/+2
| * | | | | [NETFILTER]: GRE conntrack: fix htons/htonl confusionAlexey Dobriyan2006-05-191-6/+6
| * | | | | [NETFILTER]: fix format specifier for netfilter log targetsPhilip Craig2006-05-193-3/+3
| * | | | | [NETFILTER]: Fix memory leak in ipt_recentJesper Juhl2006-05-191-1/+1
| | |_|/ / | |/| | |
| * | | | [PATCH] ohci1394, sbp2: fix "scsi_add_device failed" with PL-3507 based devicesStefan Richter2006-05-172-3/+8
| * | | | [PATCH] sbp2: add ability to override hardwired blacklistStefan Richter2006-05-172-11/+19
| * | | | [PATCH] sbp2: add read_capacity workaround for iPodStefan Richter2006-05-172-4/+46
OpenPOWER on IntegriCloud