Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Apr 2011 02:03:27 +0000 (19:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Apr 2011 02:03:27 +0000 (19:03 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
  Blackfin: SMP: fix cache flush loop
  Blackfin: time-ts: ack gptimer sooner to avoid missing short ints
  Blackfin: gptimers: fix thinko when disabling timers
  Blackfin: SMP: make all barriers handle cache issues


Trivial merge