summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/as...Linus Torvalds2011-02-155-115/+103
|\
| * dmaengine: add slave-dma maintainerDan Williams2011-02-141-0/+1
| * Merge branch 'imx' into dmaengine-fixesDan Williams2011-02-142-39/+63
| |\
| | * Merge branch 'dmaengine-shawn' into dmaengineSascha Hauer2011-01-311-10/+6
| | |\
| | | * dmaengine: imx-sdma: fix up param for the last BD in sdma_prep_slave_sg()Shawn Guo2011-01-311-1/+4
| | | * dmaengine: imx-sdma: correct sdmac->status in sdma_handle_channel_loop()Shawn Guo2011-01-311-1/+1
| | | * dmaengine: imx-sdma: return sdmac->status in sdma_tx_status()Shawn Guo2011-01-311-3/+1
| | | * dmaengine: imx-sdma: set sdmac->status to DMA_ERROR in err_out of sdma_prep_s...Shawn Guo2011-01-311-0/+1
| | | * dmaengine: imx-sdma: remove IMX_DMA_SG_LOOP handling in sdma_prep_slave_sg()Shawn Guo2011-01-311-6/+0
| | * | Merge branch 'dmaengine-sdma' into dmaengineSascha Hauer2011-01-311-25/+35
| | |\ \
| | | * | dmaengine i.MX SDMA: reserve channel 0 by not registering itSascha Hauer2011-01-311-18/+12
| | | * | dmaengine i.MX SDMA: initialize dma capabilities outside channel loopSascha Hauer2011-01-311-3/+3
| | | * | dmaengine i.MX SDMA: do not initialize chan_id fieldSascha Hauer2011-01-311-1/+0
| | | * | dmaengine i.MX sdma: check sg entries for valid addresses and lengthsSascha Hauer2011-01-311-3/+17
| | | * | dmaengine i.MX sdma: set maximum segment size for our deviceSascha Hauer2011-01-311-0/+3
| | | |/
| | * | dmaengine i.MX dma: initialize dma capabilities outside channel loopSascha Hauer2011-01-311-3/+3
| | * | dmaengine i.MX DMA: do not initialize chan_id fieldSascha Hauer2011-01-311-1/+0
| | * | dmaengine i.MX dma: check sg entries for valid addresses and lengthsSascha Hauer2011-01-311-0/+15
| | * | dmaengine i.MX dma: set maximum segment size for our deviceSascha Hauer2011-01-311-0/+4
| | |/
| * | dma: ipu_idmac: do not lose valid received data in the irq handlerAnatolij Gustschin2011-02-141-50/+0
| * | DMA: PL08x: fix channel pausing to timeout rather than lockupRussell King - ARM Linux2011-01-301-6/+15
| * | DMA: PL08x: fix infinite wait when terminating transfersRussell King - ARM Linux2011-01-301-14/+18
| * | dmaengine: imx-sdma: fix inconsistent naming in sdma_assign_cookie()Shawn Guo2011-01-291-4/+4
| * | dmaengine: imx-sdma: propagate error in sdma_probe() instead of returning 0Shawn Guo2011-01-291-1/+1
| * | dmaengine i.MX SDMA: Fix firmware loadingSascha Hauer2011-01-291-1/+1
| |/
* | Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2011-02-154-93/+125
|\ \
| * | nfsd: break lease on unlink due to renameJ. Bruce Fields2011-02-141-0/+7
| * | nfsd4: acquire only one lease per fileJ. Bruce Fields2011-02-142-42/+58
| * | nfsd4: modify fi_delegations under recall_lockJ. Bruce Fields2011-02-141-4/+4
| * | nfsd4: remove unused deleg dprintk's.J. Bruce Fields2011-02-141-4/+0
| * | nfsd4: split lease setting into separate functionJ. Bruce Fields2011-02-141-13/+19
| * | nfsd4: fix leak on allocation errorJ. Bruce Fields2011-02-141-8/+10
| * | nfsd4: add helper function for lease setupJ. Bruce Fields2011-02-141-12/+21
| * | nfsd4: split up nfsd_break_deleg_cbJ. Bruce Fields2011-02-141-18/+16
| * | NFSD: memory corruption due to writing beyond the stat arrayKonstantin Khorenko2011-02-141-1/+1
| * | NFSD: use nfserr for status after decode_cb_op_statusBenny Halevy2011-02-141-4/+2
| * | nfsd: don't leak dentry count on mnt_want_write failureJ. Bruce Fields2011-02-141-6/+6
| |/
| |
| \
*-. \ Merge branches 'core-fixes-for-linus' and 'timers-fixes-for-linus' of git://g...Linus Torvalds2011-02-152-7/+5
|\ \ \
| | * | timer debug: Hide kernel addresses via %pK in /proc/timer_listKees Cook2011-02-121-2/+2
| * | | Revert "lockdep, timer: Fix del_timer_sync() annotation"Peter Zijlstra2011-02-081-5/+3
* | | | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-02-158-25/+42
|\ \ \ \
| * \ \ \ Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/o...Ingo Molnar2011-02-152-12/+13
| |\ \ \ \
| | * | | | ARM: oprofile: Fix backtraces in timer modeAri Kauppi2011-01-262-10/+11
| | * | | | oprofile: Fix usage of CONFIG_HW_PERF_EVENTS for oprofile_perf_init and friendsAri Kauppi2011-01-261-2/+2
| | | |_|/ | | |/| |
| * | | | x86: Fix text_poke_smp_batch() deadlockPeter Zijlstra2011-02-121-1/+1
| * | | | perf tools: Fix thread_map event synthesizing in top and recordArnaldo Carvalho de Melo2011-02-104-10/+20
| * | | | watchdog, nmi: Lower the severity of error messagesDon Zickus2011-02-101-2/+8
| | |/ / | |/| |
* | | | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-02-158-15/+42
|\ \ \ \
| * | | | x86, dmi, debug: Log board name (when present) in dmesg/oops outputNaga Chumbalkar2011-02-152-8/+25
| * | | | x86, ioapic: Don't warn about non-existing IOAPICs if we have nonePaul Bolle2011-02-151-0/+3