From: Olof Johansson <olof@lixom.net>
Date: Mon, 17 Sep 2012 01:13:46 +0000 (-0700)
Subject: Merge tag 'tegra-for-3.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~3680^2~1967^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a95aa84f5ef257ee1e5c408dc0734a8bb121ed99;p=firefly-linux-kernel-4.4.55.git

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

* tag 'tegra-for-3.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: enable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA
  ARM: tegra: fix debugfs entry for Tegra30
  ARM: tegra: fix return value for debugfs init
---

a95aa84f5ef257ee1e5c408dc0734a8bb121ed99