]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/dt' into for-next
authorKevin Hilman <khilman@linaro.org>
Mon, 14 Oct 2013 20:53:21 +0000 (13:53 -0700)
committerKevin Hilman <khilman@linaro.org>
Mon, 14 Oct 2013 20:53:56 +0000 (13:53 -0700)
* next/dt:
  ARM: shmobile: bockw: fixup ether node naming
  ARM: shmobile: r8a7779: add irqpin default status on DTSI
  ARM: shmobile: marzen: fixup SMSC IRQ number on DTS
  ARM: shmobile: bockw: add SMSC support on DTS
  ARM: shmobile: r8a7778: add renesas_intc_irqpin support on DTSI
  ARM: shmobile: r8a7791 SMP device tree node
  ARM: shmobile: r8a7791 Arch timer device tree node
  ARM: shmobile: r8a7791 IRQC device tree node
  ARM: shmobile: armadillo800eva-reference: add SDHI and MMCIF interfaces
  ARM: shmobile: armadillo-reference: Add PWM backlight node to DT
  ARM: shmobile: r8a73a4: add a DT node for the DMAC
  ARM: shmobile: r8a7790: add I2C DT nodes
  ARM: shmobile: only enable used I2C interfaces in DT on all Renesas boards

Signed-off-by: Kevin Hilman <khilman@linaro.org>
1  2 
arch/arm/arm-soc-for-next-contents.txt
arch/arm/boot/dts/r8a73a4.dtsi
arch/arm/boot/dts/r8a7778.dtsi
arch/arm/boot/dts/r8a7779.dtsi
arch/arm/boot/dts/r8a7790.dtsi
arch/arm/boot/dts/sh73a0.dtsi

index 46f0b10e9a7a1b49d55bfe2b374906adc1fa5017,0000000000000000000000000000000000000000..37e53be9ec2a9f86a11883ed4783ed07bf1df217
mode 100644,000000..100644
--- /dev/null
@@@ -1,65 -1,0 +1,68 @@@
 +
 +
 +next/cleanup
 +      shark/removal
 +                git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/del-shark-for-v3.13
 +      cleanup/dt-clock
 +              https://github.com/shesselba/linux-dove.git clk-of-init-v2_for-3.13
 +      patch
 +              ARM: drop explicit selection of HAVE_CLK and CLKDEV_LOOKUP
 +      reneasas/initdata-cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes5-for-v3.12
 +      renesas/cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup-for-v3.13
 +      patch
 +              clk: nomadik: fix missing __init on nomadik_src_init
 +      renesas/cleanup2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup2-for-v3.13
 +      patch
 +              ARM: clps711x: Use linux/sched_clock.h
 +              ARM: Remove temporary sched_clock.h header
 +
 +next/soc
 +      samsung/s3c64xx-clk
 +              http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-clk-s3c64xx
 +      patch
 +              ARM: davinci: remove deprecated IRQF_DISABLED
 +      renesas/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.13
 +      renesas/smp
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-smp-for-v3.13
 +      renesas/soc2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.13
 +      keystone/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/keystone-soc-for-arm-soc
 +      patch
 +              ARM: keystone: fix PM domain initcall to be keystone only
 +
 +next/drivers
 +      davinci/gpio
 +              git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.13/gpio
 +      mvebu/drivers
 +              git://git.infradead.org/linux-mvebu.git tags/drivers-3.13
 +      arm/drivers
 +              git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git tags/arm-perf-3.13
 +
 +next/boards
 +      renesas/boards
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-boards-for-v3.13
 +      renesas/defconfig
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.13
 +
 +next/dt
 +      samsung/s3c64xx-dt
 +                http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt-s3c64xx
 +      ux500/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-for-v3.13-2
 +              patch "ARM: ux500: enable appended dtb in u8500_defconfig"
 +      ux500/dt2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-devicetree-2
 +      renesas/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v3.13
 +      mvebu/dt
 +              git://git.infradead.org/linux-mvebu.git tags/dt-3.13
++      mvebu/dt2
 +              git://git.infradead.org/linux-mvebu.git tags/dt-3.13-2
++      renesas/dt2
++              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.13
++              
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge