| commit | 96fd1112a91c82d88292249d9beb2a7ede44bb93 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Fri Nov 28 22:47:16 2014 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Fri Nov 28 22:47:16 2014 +0100 |
| tree | 940cd35ebc0a7adaae7d8679e9196d39be19b8a0 | |
| parent | 740d93b123fcc1fb5308f7c42a2ff4c755d69342 [diff] | |
| parent | e4a680099a6e97ecdbb81081cff9e4a489a4dc44 [diff] |
Merge tag 'tegra-for-3.19-soc' of git://git.kernel.org/pub/scm/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>