summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
| * | hwmon/applesmc: Simplify dependenciesJean Delvare2007-05-271-1/+1
| * | hwmon-vid: Don't spam the logs when VRM version is missingJean Delvare2007-05-271-1/+3
| * | hwmon/w83627hf: Be quiet when no chip is foundJean Delvare2007-05-271-1/+3
| * | hwmon/coretemp: Add more safety checksRudolf Marek2007-05-271-3/+29
| * | hwmon/ds1621: Fix swapped temperature limitsJean Delvare2007-05-271-4/+4
| |/
* | Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/gala...Linus Torvalds2007-05-2913-20/+39
|\ \
| * | [POWERPC] Fix Kconfig warningKumar Gala2007-05-232-1/+1
| * | [PPC] Fix modpost warningKumar Gala2007-05-231-1/+1
| * | [POWERPC] Fix modpost warningKumar Gala2007-05-231-1/+1
| * | [POWERPC] Fix Section mismatch warningsLi Yang2007-05-232-2/+2
| * | [POWERPC] QE: fix Kconfig 'select' warning with UCC_FASTTimur Tabi2007-05-232-4/+1
| * | [POWERPC] 52xx: unbreak lite5200 dts (_pic vs. -pic)Domen Puncer2007-05-232-2/+2
| * | [PPC] Remove duplicate export of __div64_32.Kumar Gala2007-05-231-2/+0
| * | [PPC] Fix COMMON symbol warningsKumar Gala2007-05-232-7/+31
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6Linus Torvalds2007-05-2922-106/+206
|\ \ \
| * | | [SCSI] megaraid_sas: intercept cmd timeout and throttle ioSumant Patro2007-05-242-12/+69
| * | | [SCSI] fusion: Fix |/|| confusionDave Jones2007-05-222-5/+5
| * | | [SCSI] aic94xx: asd_clear_nexus should fail if the cleared task does not comp...Darrick J. Wong2007-05-221-4/+10