tree bd46dba64fba48adfec403dff75682b9ba4e2774
parent 1a95620f45155ac523cd1419d89150fbb4eb858b
parent 6895f97e15895625e03c95df904d92befdac7118
author Linus Torvalds <torvalds@linux-foundation.org> 1347405173 +0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1347405173 +0800

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

Pull blackfin updates from Bob Liu:
 "One kbuild and a smp build fix."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin:
  kbuild: add symbol prefix arg to kallsyms
  blackfin: smp: adapt to generic smp helpers