Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Nov 2011 16:31:12 +0000 (14:31 -0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Nov 2011 16:31:12 +0000 (14:31 -0200)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin:
  blackfin: Fixup export.h includes
  Blackfin: add serial TX IRQ in individual platform resource


Trivial merge