]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge branch 'marco-prepare' of git://gitorious.org/sirfprima2-kernel/sirfprima2...
authorOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 04:05:19 +0000 (21:05 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 04:05:19 +0000 (21:05 -0700)
* 'marco-prepare' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel:
  ARM: SIRF: make sirf irqchip driver optional since new SoCs will have GIC
  ARM: PRIMA2: adjust Kconfig to support select SoC features
  ARM: PRIMA2: use DT_MACHINE_START and convert to generic board
  clk: prima2: move from arch/arm/mach to drivers/clk
  ARM: PRIMA2: convert to common clk and finish full clk tree

1  2 
arch/arm/Kconfig

Simple merge