diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-02-29 21:08:48 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-29 21:08:48 +0000 |
commit | 590d829a7cf882cf1a9d6fb7bdb247dc6b0993cb (patch) | |
tree | 21a1d0e576aabad465a3c1eb706f9c46a291f5d9 /arch/arm/mach-shmobile/localtimer.c | |
parent | e0e5ce59dc7b2685516219fdf44f01a8d53e0228 (diff) | |
parent | ffd76d8be36da09f8456c55569c008f5aa93095e (diff) | |
download | blackbird-op-linux-590d829a7cf882cf1a9d6fb7bdb247dc6b0993cb.tar.gz blackbird-op-linux-590d829a7cf882cf1a9d6fb7bdb247dc6b0993cb.zip |
Merge branch 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
* 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
arm/dts: Add support for TI OMAP3 EVM board
arm/dts: OMAP4: Update DTS file with new GIC bindings
arm/dts: OMAP3: Add i2c controller nodes
arm/dts: OMAP4: Add i2c controller nodes
ARM: OMAP2+: Set Kconfig dependencies for PROC_DEVICETREE
arm/dts: OMAP3&4: Remove the '0x' prefix for serial nodes
ARM: OMAP1: kconfig: Enable IRQ_DOMAIN by default for OMAP1 platforms
ARM: OMAP2+: pm: Do not init statically the SR and voltage layer with DT
ARM: OMAP2+: omap_device: Replace dev_warn by dev_dbg in omap_device_build_from_dt
ARM: OMAP2+: board-generic: Remove un-needed .atag_offset for DT_MACHINE
ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems
arm/dts: OMAP: Remove bootargs node from board files
Diffstat (limited to 'arch/arm/mach-shmobile/localtimer.c')
0 files changed, 0 insertions, 0 deletions