git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 585583d 85082fd)

author	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Tue, 15 Jul 2008 05:44:51 +0000 (15:44 +1000)
committer	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Tue, 15 Jul 2008 05:44:51 +0000 (15:44 +1000)
commit	43d2548bb2ef7e6d753f91468a746784041e522d
tree	77d13fcd48fd998393abb825ec36e2b732684a73	tree \| snapshot
parent	585583d95c5660973bc0cf64add517b040acd8a4	commit \| diff
parent	85082fd7cbe3173198aac0eb5e85ab1edcc6352c	commit \| diff

Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build

Manual fixup of:

arch/powerpc/Kconfig

18 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/entry_32.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/ppc_ksyms.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/setup_32.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
drivers/char/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/char/viotape.c	diff1 \|	diff2 \|	blob \| history
drivers/macintosh/adb.c	diff1 \|	diff2 \|	blob \| history
drivers/macintosh/smu.c	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/m8xx_pcmcia.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
mm/mprotect.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree