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
..
aoa	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
arm
atmel
core	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
drivers	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
i2c
isa	Merge branch 'topic/misc' into for-linus	2010-05-20 11:59:29 +02:00
mips
oss
parisc
pci	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
pcmcia
ppc
sh
soc	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
sparc	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
spi
synth
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
ac97_bus.c
Kconfig
last.c
Makefile
sound_core.c
sound_firmware.c