git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Olof Johansson <olof@lixom.net>
	Tue, 6 Nov 2012 16:03:46 +0000 (08:03 -0800)
committer	Olof Johansson <olof@lixom.net>
	Tue, 6 Nov 2012 19:04:13 +0000 (11:04 -0800)
commit	44e47ccf8ab6b3dbb0f3239353a40e9cd66eb531
tree	e7fabcf3fbcc3c21811e5f78cd6ea67e13cc95cd	tree \| snapshot
parent	61061a91fa1ca1aaa37f4ed6936851bfe5ac7281	commit \| diff

Merge branch 'next/multiplatform' into for-next

By Linus Walleij (10) and others
via Linus Walleij (1) and Olof Johansson (1)
* next/multiplatform:
  ARM: plat-nomadik: convert platforms to SPARSE_IRQ
  mfd/db8500-prcmu: use the irq_domain_add_simple()
  mfd/ab8500-core: use irq_domain_add_simple()
  ARM: plat-nomadik: move MTU, kill plat-nomadik
  ARM: plat-nomadik: move DMA40 header to <linux/platform_data>
  ARM: plat-nomadik: use DIV_ROUND_CLOSEST()
  ARM: plat-nomadik: pass IRQ to timer driver
  clk/ux500: explicitly include register header
  pinctrl/nomadik: merge old pincfg header
  pinctrl/nomadik: move the platform data header
  ARM: plat-nomadik: move NMK_GPIO_PER_CHIP into gpio-nomadik.h
  ARM: plat-nomadik: Introduce new DB8540 GPIO registers

Add/add conflicts in arch/arm/mach-ux500/cpu-db8500.c.

Signed-off-by: Olof Johansson <olof@lixom.net>

43 files changed:

arch/arm/Kconfig		diff \| blob \| history
arch/arm/Makefile		diff \| blob \| history
arch/arm/arm-soc-for-next-contents.txt		diff \| blob \| history
arch/arm/mach-nomadik/Kconfig		diff \| blob \| history
arch/arm/mach-nomadik/board-nhk8815.c		diff \| blob \| history
arch/arm/mach-nomadik/cpu-8815.c		diff \| blob \| history
arch/arm/mach-nomadik/i2c-8815nhk.c		diff \| blob \| history
arch/arm/mach-nomadik/include/mach/irqs.h		diff \| blob \| history
arch/arm/mach-ux500/Kconfig		diff \| blob \| history
arch/arm/mach-ux500/board-mop500-audio.c		diff \| blob \| history
arch/arm/mach-ux500/board-mop500-pins.c		diff \| blob \| history
arch/arm/mach-ux500/board-mop500-sdi.c		diff \| blob \| history
arch/arm/mach-ux500/board-mop500.c		diff \| blob \| history
arch/arm/mach-ux500/cpu-db8500.c		diff \| blob \| history
arch/arm/mach-ux500/devices-common.c		diff \| blob \| history
arch/arm/mach-ux500/devices-db8500.c		diff \| blob \| history
arch/arm/mach-ux500/devices-db8500.h		diff \| blob \| history
arch/arm/mach-ux500/include/mach/irqs.h		diff \| blob \| history
arch/arm/mach-ux500/include/mach/msp.h		diff \| blob \| history
arch/arm/mach-ux500/timer.c		diff \| blob \| history
arch/arm/mach-ux500/usb.c		diff \| blob \| history
arch/arm/plat-nomadik/Kconfig	[deleted file]	blob \| history
arch/arm/plat-nomadik/Makefile	[deleted file]	blob \| history
arch/arm/plat-nomadik/include/plat/gpio-nomadik.h	[deleted file]	blob \| history
drivers/char/hw_random/Kconfig		diff \| blob \| history
drivers/clk/ux500/u8500_clk.c		diff \| blob \| history
drivers/clocksource/Kconfig		diff \| blob \| history
drivers/clocksource/Makefile		diff \| blob \| history
drivers/clocksource/nomadik-mtu.c	[moved from arch/arm/plat-nomadik/timer.c with 95% similarity]	diff \| blob \| history
drivers/crypto/ux500/cryp/cryp_core.c		diff \| blob \| history
drivers/dma/ste_dma40.c		diff \| blob \| history
drivers/dma/ste_dma40_ll.c		diff \| blob \| history
drivers/input/keyboard/Kconfig		diff \| blob \| history
drivers/mfd/ab8500-core.c		diff \| blob \| history
drivers/mfd/db8500-prcmu.c		diff \| blob \| history
drivers/mtd/nand/Kconfig		diff \| blob \| history
drivers/pinctrl/pinctrl-nomadik.c		diff \| blob \| history
drivers/pinctrl/pinctrl-nomadik.h		diff \| blob \| history
include/linux/platform_data/clocksource-nomadik-mtu.h	[moved from arch/arm/plat-nomadik/include/plat/mtu.h with 71% similarity]	diff \| blob \| history
include/linux/platform_data/crypto-ux500.h		diff \| blob \| history
include/linux/platform_data/dma-ste-dma40.h	[moved from arch/arm/plat-nomadik/include/plat/ste_dma40.h with 100% similarity]	blob \| history
include/linux/platform_data/pinctrl-nomadik.h	[moved from arch/arm/plat-nomadik/include/plat/pincfg.h with 66% similarity]	diff \| blob \| history
sound/soc/ux500/ux500_pcm.c		diff \| blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom