summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutilsLinus Torvalds2012-03-3013-110/+259
|\
| * cpupower tools: add install target to the debug tools' makefilesFranck Bui-Huu2012-03-032-2/+24
| * cpupower tools: allow to build debug tools in a separate directory tooFranck Bui-Huu2012-03-032-14/+26
| * cpupower: Fix broken mask valuesThomas Renninger2012-03-031-2/+2
| * cpupower tool: allow to build in a separate directoryFranck Bui-Huu2012-03-032-39/+71
| * cpupower tool: makefile: simplify the recipe used to generate cpupower.pot ta...Franck Bui-Huu2012-03-031-3/+1
| * cpupower tool: remove use of undefined variables from the clean target of the...Franck Bui-Huu2012-03-031-2/+0
| * cpupower: Fix linking with --as-neededOzan Çağlayan2012-03-031-1/+1
| * cpupower: Remove unneeded code and by that fix a memleakThomas Renninger2012-03-031-7/+0
| * cpupower: Fix number of idle statesThomas Renninger2012-03-031-3/+2
| * cpupower: Unify cpupower-frequency-* manpagesThomas Renninger2012-03-032-6/+2
| * cpupower: Add cpupower-idle-info manpageThomas Renninger2012-03-031-0/+90
| * cpupower: AMD fam14h/Ontario monitor can also be used by fam12h cpusThomas Renninger2012-03-032-9/+9
| * cpupower: Better interface for accessing AMD pci registersThomas Renninger2012-03-034-23/+32
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmciaLinus Torvalds2012-03-3012-121/+43
|\ \
| * | pcmcia at91_cf: fix raw gpio number usageJoachim Eastwood2012-03-031-26/+26
| * | ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probeAxel Lin2012-03-031-9/+3
| * | pcmcia: Convert to DEFINE_PCI_DEVICE_TABLEAxel Lin2012-03-035-22/+9
| * | pcmcia: convert drivers/pcmcia/* to use module_platform_driver()Axel Lin2012-03-036-71/+6
| * | pcmcia: irq: Remove IRQF_DISABLEDYong Zhang2012-03-032-3/+3
| |/
* | Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2012-03-3081-4229/+3706
|\ \
| * | dmaengine: imx: fix the build failure on x86_64Vinod Koul2012-03-271-0/+1
| * | dmaengine: i.MX: Fix merge of cookie branch.Javier Martin2012-03-261-0/+1
| * | dmaengine: i.MX: Add support for interleaved transfers.Javier Martin2012-03-261-15/+131
| * | dmaengine: imx-dma: use 'dev_dbg' and 'dev_warn' for messages.Javier Martin2012-03-261-11/+12
| * | dmaengine: imx-dma: remove 'imx_dmav1_baseaddr' and 'dma_clk'.Javier Martin2012-03-261-76/+93
| * | dmaengine: imx-dma: remove unused arg of imxdma_sg_next.Javier Martin2012-03-261-4/+5
| * | dmaengine: imx-dma: remove internal structure.Javier Martin2012-03-261-46/+18
| * | dmaengine: imx-dma: remove 'resbytes' field of 'internal' structure.Javier Martin2012-03-261-8/+3
| * | dmaengine: imx-dma: remove 'in_use' field of 'internal' structure.Javier Martin2012-03-261-9/+0
| * | dmaengine: imx-dma: remove sg member from internal structure.Javier Martin2012-03-261-24/+18
| * | dmaengine: imx-dma: remove 'imxdma_setup_sg_hw' function.Javier Martin2012-03-261-63/+35
| * | dmaengine: imx-dma: remove 'imxdma_config_channel_hw' function.Javier Martin2012-03-261-33/+13
| * | dmaengine: imx-dma: remove 'imxdma_setup_mem2mem_hw' function.Javier Martin2012-03-261-43/+14
| * | dmaengine: imx-dma: remove dma_mode member of internal structure.Javier Martin2012-03-261-58/+45
| * | dmaengine: imx-dma: remove data member from internal structure.Javier Martin2012-03-261-1/+0
| * | dmaengine: imx-dma: merge old dma-v1.c with imx-dma.cJavier Martin2012-03-266-1010/+552
| * | dmaengine: at_hdmac: add slave config operationNicolas Ferre2012-03-214-29/+75
| * | dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclicAlexandre Bounine2012-03-2119-30/+49
| * | dmaengine/dma_slave: introduce inline wrappersAlexandre Bounine2012-03-2128-60/+67
| * | dma: imx-sdma: Treat firmware messages as warnings instead of errosFabio Estevam2012-03-211-3/+3
| * | Merge branch 'rmk_cookie_fixes2' into nextVinod Koul2012-03-1338-640/+300
| |\ \
| | * | dmaengine: fix for cookie changes and mergeVinod Koul2012-03-136-5/+7
| | * | dmaengine: pl330: fix the pl330 build after cookie cleanupVinod Koul2012-03-131-1/+0
| | * | dmaengine: ensure all DMA engine drivers initialize their cookiesRussell King - ARM Linux2012-03-139-0/+9
| | * | dmaengine: fix cookie handling in iop-adma.c and ppc4xx/adma.cRussell King - ARM Linux2012-03-132-15/+3
| | * | dmaengine: consolidate initialization of cookiesRussell King - ARM Linux2012-03-1315-28/+31
| | * | dmaengine: consolidate tx_status functionsRussell King - ARM Linux2012-03-1323-235/+93
| | * | dmaengine: provide a common function for completing a dma descriptorRussell King - ARM Linux2012-03-1319-21/+36
| | * | dmaengine: consolidate assignment of DMA cookiesRussell King - ARM Linux2012-03-1325-272/+52