Commit c290b2f2 authored Nov 30, 2011 by Linus Torvalds

Merge branch 'dt-for-linus' of git://sources.calxeda.com/kernel/linux

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

parents d6e92d36 e43fce14

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ qcom Qualcomm, Inc.
		ramtron Ramtron International
		samsung Samsung Semiconductor
		schindler Schindler
		sil Silicon Image
		simtek
		sirf SiRF Technology, Inc.
		stericsson ST-Ericsson

drivers/of/irq.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -424,6 +424,8 @@ void __init of_irq_init(const struct of_device_id *matches)

		desc->dev = np;
		desc->interrupt_parent = of_irq_find_parent(np);
		if (desc->interrupt_parent == np)
		desc->interrupt_parent = NULL;
		list_add_tail(&desc->list, &intc_desc_list);
		}