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)
commitfc21a2dd371806aed818e2ec0dfcb55dc7448a98
tree9107857e4a46feae6b09a400cbb127f72c7e35af
parentbc5b8a9003132ae44559edd63a1623b7b99dfb68
parent905905432868fa513f0f783fb9e5724536f4ee1f
Merge branch 'for-linus' of git://git./linux/kernel/git/lliubbo/blackfin

* '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