]> rtime.felk.cvut.cz Git - zynq/linux.git/commit
Merge branch 'master' into pele-peep2-34
authorJohn Linn <john.linn@xilinx.com>
Tue, 22 Jun 2010 22:54:02 +0000 (16:54 -0600)
committerJohn Linn <john.linn@xilinx.com>
Tue, 22 Jun 2010 22:54:02 +0000 (16:54 -0600)
commitde7bb75f62d0b710b5caabe63ff1cd90481ab18a
treec7ca67b6ff2f83f1212e384f87a2b187e1269cf8
parent13d428ee1b97e5c0aa4d432c9db510f0a907c45c
parent91e2c43452914a789a4bebea7c199695bbf888f2
Merge branch 'master' into pele-peep2-34

Resolved Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
drivers/gpio/Makefile
drivers/i2c/busses/Kconfig
drivers/i2c/busses/Makefile
drivers/watchdog/Kconfig
drivers/watchdog/Makefile
27 files changed:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/include/asm/atomic.h
arch/arm/include/asm/spinlock.h
arch/arm/include/asm/system.h
arch/arm/kernel/entry-armv.S
arch/arm/kernel/smp.c
arch/arm/mach-xilinx/include/mach/debug-macro.S
arch/arm/mm/Kconfig
arch/arm/tools/mach-types
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/gpio/xilinx_gpiopss.c
drivers/i2c/busses/Kconfig
drivers/i2c/busses/Makefile
drivers/i2c/busses/i2c-xilinx_pss.c
drivers/mtd/maps/Kconfig
drivers/mtd/maps/Makefile
drivers/net/Kconfig
drivers/net/Makefile
drivers/serial/Kconfig
drivers/serial/Makefile
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/watchdog/Kconfig
drivers/watchdog/Makefile
include/linux/serial_core.h