]> rtime.felk.cvut.cz Git - zynq/linux.git/commit
Merge branch 'master' of http://www.kernel.org/pub/scm/linux/kernel/git/torvalds... edk_10.1.1
authorJohn Linn <john.linn@xilinx.com>
Fri, 13 Jun 2008 15:19:50 +0000 (09:19 -0600)
committerJohn Linn <john.linn@xilinx.com>
Fri, 13 Jun 2008 19:22:24 +0000 (12:22 -0700)
commitaba38d1b50bbf88a15fe974e4f8bffbad65578a5
tree8d88fba18e3681e157ce3824132a52cede9885ed
parent178b0ca1e4d634ba2c60c367865dc571e69bffee
parentc6d8f400cc7610f04177f81168c19b8407cb48c3
Merge branch 'master' of http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

Documentation/powerpc/booting-without-of.txt
Makefile
arch/powerpc/boot/.gitignore
arch/powerpc/boot/Makefile
arch/powerpc/boot/ns16550.c
arch/powerpc/kernel/cputable.c
arch/powerpc/kernel/head_44x.S
arch/powerpc/platforms/40x/virtex.c
arch/powerpc/sysdev/xilinx_intc.c
drivers/char/xilinx_hwicap/xilinx_hwicap.c
drivers/i2c/algos/Kconfig
drivers/input/serio/Makefile
drivers/of/Kconfig
38 files changed:
Documentation/powerpc/booting-without-of.txt
arch/powerpc/Kconfig
arch/powerpc/boot/.gitignore
arch/powerpc/boot/Makefile
arch/powerpc/boot/wrapper
arch/powerpc/kernel/cputable.c
arch/powerpc/kernel/entry_32.S
arch/powerpc/kernel/head_44x.S
arch/powerpc/platforms/40x/virtex.c
arch/powerpc/platforms/44x/Kconfig
arch/powerpc/platforms/44x/Makefile
arch/powerpc/platforms/44x/virtex.c
arch/powerpc/platforms/Kconfig
arch/ppc/Kconfig
drivers/Kconfig
drivers/Makefile
drivers/char/Kconfig
drivers/char/Makefile
drivers/i2c/algos/Kconfig
drivers/input/keyboard/Kconfig
drivers/input/keyboard/Makefile
drivers/input/serio/Kconfig
drivers/input/serio/Makefile
drivers/misc/Kconfig
drivers/mtd/maps/Kconfig
drivers/mtd/maps/Makefile
drivers/mtd/maps/uclinux.c
drivers/net/Kconfig
drivers/net/Makefile
drivers/of/Kconfig
drivers/serial/Kconfig
drivers/serial/uartlite.c
drivers/video/Kconfig
include/asm-powerpc/dcr-native.h
include/asm-powerpc/irq.h
include/asm-ppc/mmu.h
include/linux/console.h
mm/nommu.c