Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Oct 2012 01:05:15 +0000 (04:05 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Oct 2012 01:05:15 +0000 (04:05 +0300)
commit4a09cbcee49a6f94fa5f56e90b087dfbeb005b77
tree1c00e9ac1560337cf054023fd4d841babf607095
parent62472efed98ef086aaa86e735ae50ac9473d7891
parent7805963387ddd7c48bed8c87b6a5de26ac79299f
Merge branch 'stable' of git://git./linux/kernel/git/cmetcalf/linux-tile

Pull tile fixes from Chris Metcalf:
 "This fixes one issue with compiler flags that can cause modules not to
  load, and cleans up some warnings with ELF_R_xxx defines."

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile: avoid build warnings from duplicate ELF_R_xxx #defines
  arch/tile: avoid generating .eh_frame information in modules