Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Sep 2012 23:12:53 +0000 (07:12 +0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Sep 2012 23:12:53 +0000 (07:12 +0800)
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

1  2 
scripts/link-vmlinux.sh

Simple merge