From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Apr 2014 15:11:57 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
X-Git-Tag: drm-fsl-dcu-for-next~5566
X-Git-Url: http://git.agner.ch/gitweb/?a=commitdiff_plain;h=18a1a7a1d862ae0794a0179473d08a414dd49234;p=linux-drm-fsl-dcu.git

Merge git://git./linux/kernel/git/cmetcalf/linux-tile

Pull arch/tile updates from Chris Metcalf:
 "These fix a few stray build issues seen in linux-next, and also add
  the minimal required support for perf to tilegx"

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile: remove unused variable 'devcap'
  tile: Fix vDSO compilation issue with allyesconfig
  perf tools: Allow building for tile
  tile/perf: Support perf_events on tilegx and tilepro
  tile: Enable NMIs on return from handle_nmi() without errors
  tile: Add support for handling PMC hardware
  tile: don't use __get_cpu_var() with structure-typed arguments
  tile: avoid overflow in ns2cycles
---

18a1a7a1d862ae0794a0179473d08a414dd49234