summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* powerpc: Rework VDSO gettimeofday to prevent time going backwardsPaul Mackerras2010-07-095-237/+99
* Merge commit 'paulus-perf/master' into nextBenjamin Herrenschmidt2010-07-0918-52/+2408
|\
| * powerpc, hw_breakpoint: Tell generic code we have no instruction breakpointsPaul Mackerras2010-06-302-4/+11
| * powerpc, hw_breakpoint: Cooperate better with other single-steppersPaul Mackerras2010-06-231-6/+7
| * powerpc, hw_breakpoint: Fix off-by-one in checking access addressPaul Mackerras2010-06-231-16/+7
| * powerpc, hw_breakpoint: Discard extraneous interrupt due to accesses outside ...K.Prasad2010-06-222-2/+22
| * powerpc, hw_breakpoint: Enable hw-breakpoints while handling intervening signalsK.Prasad2010-06-223-0/+24
| * powerpc, hw_breakpoint: Handle concurrent alignment interruptsK.Prasad2010-06-221-5/+3
| * powerpc, hw_breakpoints: Implement hw_breakpoints for 64-bit server processorsK.Prasad2010-06-2211-0/+495
| * hw_breakpoints: Allow arch-specific cleanup before breakpoint unregistrationK.Prasad2010-06-221-0/+12
| * powerpc: Emulate most Book I instructions in emulate_step()Paul Mackerras2010-06-225-47/+1855
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2010-07-0815-66/+148
|\ \
| | \
| | \
| *-. \ Merge branches 'cxgb4', 'ipoib' and 'qib' into for-nextRoland Dreier2010-07-089-41/+106
| |\ \ \
| | | * | IB/qib: Clean up properly if qib_init() failsRalph Campbell2010-07-061-0/+10
| | | * | IB/qib: Completion queue callback needs to be single threadedRalph Campbell2010-07-061-1/+1
| | | * | IB/qib: Update 7322 serdes tablesRalph Campbell2010-07-061-4/+12
| | | * | IB/qib: Clear 6120 hardware error registerRalph Campbell2010-07-061-2/+1
| | | * | IB/qib: Clear eager buffer memory for each new processRalph Campbell2010-07-061-0/+3
| | | * | IB/qib: Mask hardware error during link resetRalph Campbell2010-07-062-26/+31
| | | * | IB/qib: Don't mark VL15 bufs as WC to avoid a rare 7322 chip problemDave Olson2010-07-066-6/+46
| | * | | IPoIB: Fix world-writable child interface control sysfs attributesOr Gerlitz2010-07-061-2/+2
| | |/ /
| * | | RDMA/cxgb4: Derive smac_idx from port viidSteve Wise2010-07-061-4/+5
| * | | RDMA/cxgb4: Avoid false GTS CIDX_INC overflowsSteve Wise2010-07-061-5/+20
| * | | RDMA/cxgb4: Don't call abort_connection() for active connect failuresSteve Wise2010-07-061-1/+2
| * | | RDMA/cxgb4: Use the DMA state API instead of the pci equivalentsFUJITA Tomonori2010-07-065-15/+15
| |/ /
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw...Linus Torvalds2010-07-082-2/+18
|\ \ \
| * \ \ Merge branch 'fix/misc' into for-linusTakashi Iwai2010-07-081-0/+13
| |\ \ \
| | * | | ALSA: usb-audio - Add volume resolution quirk for some Logitech webcamsAlexey Fisher2010-06-231-0/+13
| * | | | Merge branch 'fix/hda' into for-linusTakashi Iwai2010-07-081-2/+5
| |\ \ \ \
| | * | | | ALSA: hda - Enable beep on Realtek codecs with PCI SSID overrideTakashi Iwai2010-07-051-1/+3
| | * | | | ALSA: hda - Add Macbook 5,2 quirkLuke Yelavich2010-06-221-0/+1
| | * | | | ALSA: hda - Fix uninitialized variableTakashi Iwai2010-06-221-1/+1
* | | | | | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2010-07-088-254/+122
|\ \ \ \ \ \
| * | | | | | writeback: simplify the write back thread queueChristoph Hellwig2010-07-063-197/+72
| * | | | | | writeback: split writeback_inodes_wbChristoph Hellwig2010-07-062-38/+46
| * | | | | | writeback: remove writeback_inodes_wbcChristoph Hellwig2010-07-066-20/+6
| * | | | | | fs-writeback: fix kernel-doc warningsRandy Dunlap2010-07-011-1/+1
| * | | | | | splice: check f_mode for seekable fileChangli Gao2010-06-301-4/+2
| * | | | | | splice: direct_splice_actor() should not use pos in sdChangli Gao2010-06-301-1/+2
* | | | | | | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2010-07-0813-37/+184
|\ \ \ \ \ \ \
| * | | | | | | powerpc: Fix userspace build of ptrace.hSam Ravnborg2010-07-081-18/+14
| * | | | | | | powerpc: Fix default_machine_crash_shutdown #ifdef botchPaul E. McKenney2010-07-081-1/+1
| * | | | | | | powerpc: Fix logic error in fixup_irqsJohannes Berg2010-07-081-1/+4
| * | | | | | | powerpc/iseries: Fix possible null pointer dereference in iSeries_pcibios_fix...Denis Kirjanov2010-07-081-1/+5
| * | | | | | | powerpc: Linux cannot run with 0 coresAnton Blanchard2010-07-081-1/+1
| * | | | | | | powerpc: Fix feature-fixup tests for gcc 4.5Stephen Rothwell2010-07-081-8/+9
| * | | | | | | powerpc: Disable SPARSE_IRQ by defaultYang Li2010-07-081-2/+2
| * | | | | | | powerpc: Fix compile errors in prom_init_check for gcc 4.5Stephen Rothwell2010-07-081-0/+6
| * | | | | | | powerpc: Fix module building for gcc 4.5 and 64 bitStephen Rothwell2010-07-084-4/+138
| * | | | | | | powerpc/perf_event: Fix for power_pmu_disable()Matt Evans2010-07-081-1/+4