tree 4229aa4d6a69ecb7b7b6798ad836bb1250bd695a
parent fd58b517e593ed4f54d8c8b47613928c2066c046
parent 3cb3f839d306443f3d1e79b0bde1a2ad2c12b555
author Linus Torvalds <torvalds@linux-foundation.org> 1371751662 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1371751662 -1000

Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Pull tilepro fix from Chris Metcalf:
 "This change allows the older tilepro architecture to be correctly
  built by newer gccs, despite a change that caused gcc to start trying
  to use an out-of-line implementation for __builtin_ffsll().

  This should be inline again starting with gcc 4.7.4 and 4.8.2 or so,
  but meanwhile this change keeps things from breaking, with the only
  cost being a few bytes of code in the kernel to provide __ffsdi2 even
  for compilers that do inline it"

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tilepro: work around module link error with gcc 4.7