ae6b09a400cbb127f72c7e35af
parent bc5b8a9003132ae44559edd63a1623b7b99dfb68
parent 905905432868fa513f0f783fb9e5724536f4ee1f
author Linus Torvalds <torvalds@linux-foundation.org> 1321374672 -0200
committer Linus Torvalds <torvalds@linux-foundation.org> 1321374672 -0200

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
X