summaryrefslogtreecommitdiffstats
path: root/sound
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm' (patches from Andrew Morton)Linus Torvalds2013-11-132-4/+2
|\
| * sound/soc/pxa/mmp-pcm.c: use gen_pool_dma_alloc() to allocate dma bufferNicolin Chen2013-11-131-2/+1
| * sound/soc/davinci/davinci-pcm.c: use gen_pool_dma_alloc() in davinci-pcm.cNicolin Chen2013-11-131-2/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2013-11-132-30/+9
|\ \ | |/ |/|
| * consolidate the reassignments of ->f_op in ->open() instancesAl Viro2013-10-242-30/+9
* | Merge tag 'devicetree-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2013-11-1210-2/+15
|\ \
| * \ Merge remote-tracking branch 'grant/devicetree/next' into for-nextRob Herring2013-11-0712-41/+95
| |\ \
| * | | drivers: clean-up prom.h implicit includesRob Herring2013-10-0910-2/+15
* | | | Merge tag 'sound-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/t...Linus Torvalds2013-11-12217-3806/+7700
|\ \ \ \
| * \ \ \ Merge tag 'asoc-v3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...Takashi Iwai2013-11-0835-120/+192
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'asoc/topic/wm8996' into asoc-nextMark Brown2013-11-081-0/+2
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-nextMark Brown2013-11-081-110/+116
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'asoc/topic/wm8400' into asoc-nextMark Brown2013-11-081-75/+20
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-nextMark Brown2013-11-081-4/+4
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'asoc/topic/warn' into asoc-nextMark Brown2013-11-0828-92/+138
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | ASoC: dapm: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-071-6/+8
| | | * | | | | | | | ASoC: wm_adsp: Fix BUG_ON() and WARN_ON() usagesTakashi Iwai2013-11-071-11/+6
| | | * | | | | | | | ASoC: Replace BUG() with WARN()Takashi Iwai2013-11-072-5/+7
| | | * | | | | | | | ASoC: wm_hubs: Replace BUG() with WARN()Takashi Iwai2013-11-071-1/+1
| | | * | | | | | | | ASoC: wm8996: Replace BUG() with WARN()Takashi Iwai2013-11-071-6/+6
| | | * | | | | | | | ASoC: wm8962: Replace BUG() with WARN()Takashi Iwai2013-11-071-5/+5
| | | * | | | | | | | ASoC: wm8958: Replace BUG() with WARN()Takashi Iwai2013-11-071-1/+1
| | | * | | | | | | | ASoC: wm8904: Replace BUG() with WARN()Takashi Iwai2013-11-071-1/+1
| | | * | | | | | | | ASoC: wm8900: Replace BUG() with WARN()Takashi Iwai2013-11-071-1/+2
| | | * | | | | | | | ASoC: wm8350: Replace BUG() with WARN()Takashi Iwai2013-11-071-1/+1
| | | * | | | | | | | ASoC: txx9: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-071-3/+6
| | | * | | | | | | | ASoC: sh: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-071-1/+2
| | | * | | | | | | | ASoC: rcar: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-072-2/+4
| | | * | | | | | | | ASoC: s6000: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-071-1/+2
| | | * | | | | | | | ASoC: pxa: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-071-1/+2
| | | * | | | | | | | ASoC: omap: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-071-2/+5
| | | * | | | | | | | ASoC: mid-x86: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-071-2/+4
| | | * | | | | | | | ASoC: wm9713: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-061-1/+2
| | | * | | | | | | | ASoC: wm8904: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-061-1/+2
| | | * | | | | | | | ASoC: wm8900: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-061-3/+5
| | | * | | | | | | | ASoC: wm8776: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-061-1/+2
| | | * | | | | | | | ASoC: wm5100: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-061-1/+2
| | | * | | | | | | | ASoC: wm8580: Use WARN() instead of BUG_ON()Takashi Iwai2013-11-061-1/+1
| | | * | | | | | | | ASoC: wm2000: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-061-5/+10
| | | * | | | | | | | ASoC: wm0010: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-061-1/+2
| | | * | | | | | | | ASoC: tpa6130a2: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-061-7/+14
| | | * | | | | | | | ASoC: max98095: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-061-6/+10
| | | * | | | | | | | ASoC: max98088: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-061-3/+5
| | | * | | | | | | | ASoC: blackfin: Use WARN_ON() instead of BUG_ON()Takashi Iwai2013-11-061-12/+20
| | * | | | | | | | | Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-nextMark Brown2013-11-081-19/+7
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-nextMark Brown2013-11-082-62/+64
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'asoc/topic/tpa6130a2' into asoc-nextMark Brown2013-11-081-9/+23
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-nextMark Brown2013-11-081-121/+113
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-nextMark Brown2013-11-081-71/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-nextMark Brown2013-11-082-116/+28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \