summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma...Linus Torvalds2012-05-2541-780/+2898
|\
| * Merge branch 'for-next-arm-dma' into for-linusMarek Szyprowski2012-05-229-461/+1123
| |\
| | * ARM: dma-mapping: add support for IOMMU mapperMarek Szyprowski2012-05-215-12/+747
| | * ARM: dma-mapping: use alloc, mmap, free from dma_opsMarek Szyprowski2012-05-213-66/+104
| | * ARM: dma-mapping: remove redundant code and do the cleanupMarek Szyprowski2012-05-211-64/+24
| | * ARM: dma-mapping: move all dma bounce code to separate dma ops structureMarek Szyprowski2012-05-213-120/+120
| | * ARM: dma-mapping: implement dma sg methods on top of any generic dma opsMarek Szyprowski2012-05-211-24/+19
| | * ARM: dma-mapping: use asm-generic/dma-mapping-common.hMarek Szyprowski2012-05-214-231/+115
| | * ARM: dma-mapping: remove offset parameter to prepare for generic dma_opsMarek Szyprowski2012-05-213-39/+45
| | * ARM: dma-mapping: introduce DMA_ERROR_CODE constantMarek Szyprowski2012-05-213-5/+7
| | * ARM: dma-mapping: use pr_* instread of printkMarek Szyprowski2012-05-211-8/+8
| | * ARM: dma-mapping: use dma_mmap_from_coherent()Marek Szyprowski2012-05-211-0/+3
| | * common: add dma_mmap_from_coherent() functionMarek Szyprowski2012-05-212-1/+45
| * | ARM: dma-mapping: use PMD size for section unmapVitaly Andrianov2012-05-211-1/+1
| * | cma: fix migration modeMinchan Kim2012-05-211-1/+1
| * | ARM: integrate CMA with DMA-mapping subsystemMarek Szyprowski2012-05-219-88/+370
| * | X86: integrate CMA with DMA-mapping subsystemMarek Szyprowski2012-05-216-9/+38
| * | drivers: add Contiguous Memory AllocatorMarek Szyprowski2012-05-218-0/+641
| * | mm: trigger page reclaim in alloc_contig_range() to stabilise watermarksMarek Szyprowski2012-05-212-0/+69
| * | mm: extract reclaim code from __alloc_pages_direct_reclaim()Marek Szyprowski2012-05-211-9/+21
| * | mm: Serialize access to min_free_kbytesMel Gorman2012-05-211-8/+15
| * | mm: page_isolation: MIGRATE_CMA isolation functions addedMichal Nazarewicz2012-05-216-27/+34
| * | mm: mmzone: MIGRATE_CMA migration type addedMichal Nazarewicz2012-05-216-27/+106
| * | mm: page_alloc: change fallbacks array handlingMichal Nazarewicz2012-05-211-4/+5
| * | mm: page_alloc: introduce alloc_contig_range()Michal Nazarewicz2012-05-212-0/+196
| * | mm: compaction: export some of the functionsMichal Nazarewicz2012-05-213-173/+191
| * | mm: compaction: introduce isolate_freepages_range()Michal Nazarewicz2012-05-211-18/+93
| * | mm: compaction: introduce map_pages()Michal Nazarewicz2012-05-211-4/+11
| * | mm: compaction: introduce isolate_migratepages_range()Michal Nazarewicz2012-05-211-21/+54
| * | mm: page_alloc: remove trailing whitespaceMichal Nazarewicz2012-05-211-7/+7
| |/
* | Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/...Linus Torvalds2012-05-2516-234/+582
|\ \
| * | ALSA: hda/realtek - Add new codec support for ALC269VDKailang Yang2012-05-251-5/+33
| * | ALSA: core: group read of pointer, tstamp and jiffiesPierre-Louis Bossart2012-05-231-5/+18
| * | Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/a...Takashi Iwai2012-05-2314-224/+531
| |\ \
| | * | ASoC: OMAP: HDMI: Rename sound card source fileRicardo Neri2012-05-222-2/+2
| | * | ASoC: OMAP: HDMI: Make sound card naming more genericRicardo Neri2012-05-221-14/+14
| | * | ASoC: OMAP: HDMI: Make build config options more genericRicardo Neri2012-05-222-4/+4
| | * | ASoC: OMAP: HDMI: Expand capabilities of the HDMI DAIRicardo Neri2012-05-222-2/+4
| | * | ASoC: OMAP: HDMI: Improve how the display state is verifiedRicardo Neri2012-05-222-35/+8
| | * | ASoC: OMAP: HDMI: Expand configuration of hw_paramsRicardo Neri2012-05-221-1/+115
| | * | ASoC: OMAP: HDMI: Use the DSS audio interfaceRicardo Neri2012-05-222-0/+78
| | * | ASoC: OMAP: HDMI: Create a structure for private data of the CPU DAIRicardo Neri2012-05-221-9/+19
| | * | ASoC: OMAP: HDMI: Change error values in HDMI CPU DAIRicardo Neri2012-05-221-2/+2
| | * | ASoC: OMAP: HDMI: Update the platform device namesRicardo Neri2012-05-222-6/+6
| | * | ASoC: omap-abe-twl6040: Introduce driver data for runtime parametersPeter Ujfalusi2012-05-221-4/+21
| | * | ASoC: omap-abe-twl6040: Move Digital Mic widget into dapm tablePeter Ujfalusi2012-05-221-10/+3
| | * | ASoC: omap-abe-twl6040: Keep only one snd_soc_dai_link structurePeter Ujfalusi2012-05-221-21/+9
| | * | ASoC: omap-dmic: Add device tree bindingsPeter Ujfalusi2012-05-222-0/+29
| | * | ASoC: omap-mcpdm: Add device tree bindingsPeter Ujfalusi2012-05-222-0/+29
| | * | ASoC: omap-mcbsp: buffer size constraint only applies to playback streamPeter Ujfalusi2012-05-221-6/+8