Merge tag 'tegra-for-7.2-pmc-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

soc/tegra: pmc: Fixes for v7.2

This contains two fixes, one for a bad error unwinding path and another
for an #ifdef block that wasn't covering all the combinations correctly.

* tag 'tegra-for-7.2-pmc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  soc/tegra: pmc: fix #ifdef block in header
  drm/tegra: Fix a strange error handling path

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

diff --cc drivers/gpu/drm/tegra/sor.c
Simple merge