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
..
codecs	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
core	powerpc/aoa: gpio-pmf.c: 3 * redundant code	2010-04-07 18:00:36 +10:00
fabrics	of: Always use 'struct device.of_node' to get device node pointer.	2010-05-18 16:10:44 -06:00
soundbus	arch/powerpc: Move dma_mask from of_device into pdev_archdata	2010-05-22 00:10:40 -06:00
aoa-gpio.h	ALSA: snd-aoa: handle master-amp if present	2009-01-15 18:28:37 +01: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