From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 27 Mar 2014 00:54:39 +0000 (+0100)
Subject: Merge tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssant... 
X-Git-Tag: v3.15-rc1~77^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4de6732f88552e4f8fc504070ca4b840e7fe75f4;p=pandora-kernel.git

Merge tag 'keystone-dts-fixes' of git://git./linux/kernel/git/ssantosh/linux-keystone into next/dt

Merge "Keystone DTS fixes for 3.15" from Santosh Shilimkar:

- Few fixes found during NAND ubifs testing
- Fix to build all dtbs together with dtbs
- Last patch is follow up comment from previous pull request

* tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone: use common "ti,keystone" compatible instead of -evm
  ARM: dts: k2hk-evm: set ubifs partition size for 512M NAND
  ARM: dts: Build all keystone dt blobs
  ARM: dts: keystone: Fix control register range for clktsip
  ARM: dts: keystone: Fix domain register range for clkfftc1

Conflicts:
	arch/arm/boot/dts/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

4de6732f88552e4f8fc504070ca4b840e7fe75f4
Reading git-diff-tree failed