Benjamin Herrenschmidt 6dc6472581 Merge commit 'origin' ... Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h		2008-10-15 11:31:54 +11:00
..
codecs	ALSA: aoa - Remove duplicate assignment of SNDRV_PCM_FMTBIT_S{16,24}_BE bits	2008-08-25 09:57:14 +02:00
core	[POWERPC] Rename get_property to of_get_property: sound	2007-04-13 03:55:19 +10:00
fabrics	sound: Convert to menuconfig	2008-05-27 15:56:20 +02:00
soundbus	powerpc/drivers: Use linux/of_device.h instead of asm/of_device.h	2008-08-20 16:34:59 +10:00
aoa-gpio.h	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
aoa.h	[ALSA] Remove sound/driver.h	2008-01-31 17:29:48 +01:00
Kconfig	sound: Convert to menuconfig	2008-05-27 15:56:20 +02:00
Makefile	[PATCH] aoa: fix when all is built into the kernel	2006-07-10 13:24:19 -07:00