From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Jun 2013 18:07:42 +0000 (-1000)
Subject: Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f92d0dc95d137c0abe7d1478d6e7d2cf4ca5fce8;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'stable' of git://git./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
---

f92d0dc95d137c0abe7d1478d6e7d2cf4ca5fce8