pilppa.com Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit

author	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Wed, 15 Oct 2008 00:31:54 +0000 (11:31 +1100)
committer	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Wed, 15 Oct 2008 00:31:54 +0000 (11:31 +1100)
commit	6dc6472581f693b5fc95aebedf67b4960fb85cf0
tree	06a5a9a08519950575505273eabced331ed51405	tree \| snapshot
parent	ee673eaa72d8d185012b1027a05e25aba18c267f	commit \| diff
parent	8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e	commit \| diff

Merge commit 'origin'

Manual fixup of conflicts on:

arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h

12 files changed:

Unnamed repository; edit this file 'description' to name the repository.

arch/powerpc/boot/Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/boot/dts/mpc8610_hpcd.dts	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/sections.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/cell/spufs/inode.c	diff1 \|	diff2 \|	blob \| history
drivers/block/floppy.c	diff1 \|	diff2 \|	blob \| history
drivers/char/hvc_console.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ibm_newemac/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ibm_newemac/mal.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ibm_newemac/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/pnp/pnpbios/core.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/Kconfig	diff1 \|	diff2 \|	blob \| history