Merge branch 'dt-for-linus' of git://sources.calxeda.com/kernel/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Dec 2011 00:24:43 +0000 (16:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Dec 2011 00:24:43 +0000 (16:24 -0800)
* 'dt-for-linus' of git://sources.calxeda.com/kernel/linux:
  of: Add Silicon Image vendor prefix
  of/irq: of_irq_init: add check for parent equal to child node


Trivial merge