tree 69dee0556b482898ae95f1bdfa25c63f4ce16f57
parent 5aa1c98862d3f365d9cf6d0833d5dc127d2a76e7
parent b0d33c2bd77bcf2d7c9427d2361ac57fe5b33aa1
author Linus Torvalds <torvalds@linux-foundation.org> 1367354857 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1367354857 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull fixup for trivial branch from Jiri Kosina:
 "Unfortunately I made a mistake when merging into for-linus branch, and
  omitted one pre-requisity patch for a few other patches (which have
  been Acked by the appropriate maintainers) in the series.  Mea culpa
  maxima, sorry for that."

The trivial branch added %pSR usage before actually teaching vsnprintf()
about the 'R' part of %pSR.  The 'R' causes the symbol translation to do
a "__builtin_extract_return_addr()" before symbol lookup.

That said, on most architectures __builtin_extract_return_addr() isn't
likely to do anything special, so it probably is not normally
noticeable.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  vsprintf: Add extension %pSR - print_symbol replacement