From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 28 Nov 2014 21:47:16 +0000 (+0100)
Subject: Merge tag 'tegra-for-3.19-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra... 
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~17^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96fd1112a91c82d88292249d9beb2a7ede44bb93;p=pandora-kernel.git

Merge tag 'tegra-for-3.19-soc' of git://git./linux/kernel/git/tegra/linux into next/fixes-non-critical

Pull "ARM: tegra: Core code changes for v3.19" from Thierry Reding:

This contains a single fix for a bug that was introduced back in v3.13.

* tag 'tegra-for-3.19-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Re-add removed SoC id macro to tegra_resume()

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

96fd1112a91c82d88292249d9beb2a7ede44bb93
Reading git-diff-tree failed