summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* e1000: restore netif_poll_enable call but make sure IRQs are offHerbert Xu2007-05-301-1/+8
* defxx: Fix the handling of ioremap() failuresMaciej W. Rozycki2007-05-301-0/+1
* sky2: program proper register for fiber PHYStephen Hemminger2007-05-301-1/+1
* sky2: checksum offload plus vlan bugStephen Hemminger2007-05-301-1/+1
* sky2: dont set bogus bit in PHY registerStephen Hemminger2007-05-302-23/+1
* Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Jeff Garzik2007-05-304-9/+16
|\
| * [PATCH] hostap: Allocate enough tailroom for TKIPBrandon Craig Rhodes2007-05-291-5/+8
| * [PATCH] softmac: alloc_ieee80211() NULL checkAkinobu Mita2007-05-291-1/+4
| * [PATCH] ieee80211: fix incomplete error messageAkinobu Mita2007-05-291-1/+1
| * [PATCH] prism54: fix monitor mode oopsBjörn Steinbrink2007-05-291-2/+3
* | random: fix seeding with zero entropyMatt Mackall2007-05-301-24/+31
* | random: fix error in entropy extractionMatt Mackall2007-05-301-5/+7
* | Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/rolan...Linus Torvalds2007-05-305-55/+55
|\ \
| * | IB/mlx4: Fix last allocated object tracking in bitmap allocatorRoland Dreier2007-05-301-1/+1
| * | IB/cm: Fix stale connection detectionSean Hefty2007-05-301-11/+14
| * | IPoIB/cm: Fix performance regression on MellanoxMichael S. Tsirkin2007-05-302-40/+37
| * | IB/mthca: Fix handling of send CQE with error for QPs connected to SRQMichael S. Tsirkin2007-05-301-3/+3
* | | NOHZ: prevent multiplication overflow - stop timer for huge timeoutsThomas Gleixner2007-05-303-2/+30
|/ /
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sp...Linus Torvalds2007-05-2947-853/+2728
|\ \
| * | [SPARC64]: Fill holes in hypervisor APIs and fix KTSB registry.David S. Miller2007-05-294-107/+1160
| * | [SPARC64]: Fix two bugs wrt. kernel 4MB TSB.David S. Miller2007-05-293-7/+31
| * | [SPARC]: Mark as emulating cmpxchg, add appropriate depends for DRM.Martin Habets2007-05-292-1/+8
| * | [SPARC]: Emulate cmpxchg like pariscKyle McMartin2007-05-292-0/+53
| * | [SPARC64]: Fix _PAGE_EXEC_4U check in sun4u I-TLB miss handler.David S. Miller2007-05-291-2/+2
| * | [SPARC]: Linux always started with 9600 8N1Jan Engelhardt2007-05-291-3/+3
| * | [SPARC64]: arch/sparc64/time.c doesn't compile on Ultra 1 (no PCI)Horst H. von Brand2007-05-291-0/+6
| * | [SPARC64]: Eliminate NR_CPUS limitations.David S. Miller2007-05-296-16/+43
| * | [SPARC64]: Use machine description and OBP properly for cpu probing.David S. Miller2007-05-2921-394/+992
| * | [SPARC64]: Negotiate hypervisor API for PCI services.David S. Miller2007-05-291-0/+18
| * | [SPARC64]: Report proper system soft state to the hypervisor.David S. Miller2007-05-2912-7/+175
| * | [SPARC64]: Fix typo in sun4v_hvapi_register error handling.David S. Miller2007-05-291-1/+1
| * | [SCSI] ESP: Kill SCSI_ESP_CORE and link directly just like jazz_espDavid S. Miller2007-05-292-16/+1
| * | [SCSI] jazz_esp: Converted to use esp_core.Thomas Bogendoerfer2007-05-292-247/+184
| * | [SPARC64]: PCI device scan is way too verbose by default.David S. Miller2007-05-291-14/+40
| * | [SERIAL] sunzilog: section mismatch fixKrzysztof Helt2007-05-291-2/+2
| * | [SPARC32]: Removes mismatch section warnigs in sparc time.c fileKrzysztof Helt2007-05-291-2/+2
| * | [SPARC64]: Don't be picky about virtual-dma values on sun4v.David S. Miller2007-05-291-26/+10
| * | [SPARC64]: Kill unused DIE_PAGE_FAULT enum value.Christoph Hellwig2007-05-291-1/+0
| * | [SCSI] pluto: Use wait_for_completion_timeout.Christoph Hellwig2007-05-291-14/+4
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee...Linus Torvalds2007-05-298-43/+94
|\ \
| * | firewire: fix return codeJeff Garzik2007-05-271-1/+1
| * | firewire: prefix modules with firewire- instead of fw-Stefan Richter2007-05-272-12/+14
| * | firewire: Add missing byteswapping for receive DMA programs.Kristian Høgsberg2007-05-271-2/+3
| * | ieee1394: raw1394: Fix async sendPetr Vandrovec2007-05-271-3/+5
| * | ieee1394: eth1394: bring back a parent deviceStefan Richter2007-05-271-4/+3
| * | ieee1394: eth1394: handle tlabel exhaustionStefan Richter2007-05-272-17/+67
| * | ieee1394: eth1394: remove bogus netif_wake_queueStefan Richter2007-05-271-4/+0
| * | ieee1394: sbp2: include workqueue.hStefan Richter2007-05-271-0/+1
| |/
* | Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6Linus Torvalds2007-05-296-11/+46
|\ \
| * | hwmon/applesmc: Handle name file creation error and deletionNicolas Boichat2007-05-271-1/+6