From: Linus Torvalds Date: Tue, 15 Nov 2011 16:31:12 +0000 (-0200) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo... X-Git-Tag: v3.2-rc2~5 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fc21a2dd371806aed818e2ec0dfcb55dc7448a98;p=users%2Fhch%2Fxfs.git 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 --- fc21a2dd371806aed818e2ec0dfcb55dc7448a98