Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/sound/soc
History
Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree 
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2010-05-22 00:36:56 -06:00
..
atmel ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream 2010-04-05 19:14:11 +01:00
au1x include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
blackfin Merge branch 'topic/asoc' into for-linus 2010-05-20 12:00:43 +02:00
codecs Merge branch 'topic/asoc' into for-linus 2010-05-20 12:00:43 +02:00
davinci Merge branch 'topic/asoc' into for-linus 2010-05-20 12:00:43 +02:00
fsl of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
imx Merge branch 'topic/asoc' into for-linus 2010-05-20 12:00:43 +02:00
omap Merge branch 'topic/asoc' into for-linus 2010-05-20 12:00:43 +02:00
pxa Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2010-05-20 09:41:44 -07:00
s3c24xx ASoC: Allow active paths from the GSM modem while the GTA02 is suspended 2010-05-10 10:37:04 +01:00
s6000 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2010-04-07 08:42:25 -07:00
sh Merge branch 'topic/asoc' into for-linus 2010-05-20 12:00:43 +02:00
txx9 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 2010-05-21 17:05:46 -07:00
Kconfig ASoC: Hook i.MX into build 2009-08-15 11:37:30 +01:00
Makefile ASoC: Add bit clock rate calculator utility functions 2009-11-12 16:45:48 +00:00
soc-cache.c ASoC: Add debug output tracing all cache register writes 2010-05-05 15:10:17 +01:00
soc-core.c Merge branch 'topic/asoc' into for-linus 2010-05-20 12:00:43 +02:00
soc-dapm.c Merge branch 'topic/asoc' into for-linus 2010-05-20 12:00:43 +02:00
soc-jack.c ASoC: Allow reporting of NULL jacks 2010-04-23 17:07:10 +01:00
soc-utils.c ASoC: Add BCLK calculation utility for TDM mode too 2009-11-25 19:55:46 +00:00