Merge branch 'irqdomain/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Mar 2012 21:11:54 +0000 (14:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Mar 2012 21:11:54 +0000 (14:11 -0700)
commit55a320308902f7a0746569ee57eeb3f254e6ed16
tree43c86db843ede6a0c2aeeb147bad78bc209514cc
parent18a06efae5b37bf5cb7473b5ba91a50907a8f7ac
parentd4886bc670a5ab1b74bd0a87a64344d18af206c3
Merge branch 'irqdomain/merge' of git://git.secretlab.ca/git/linux-2.6

Pull the code to generalize the powerpc VIRQ_DEBUG code from Grant Likely.

That code had been moved into generic irqdomain code, but still had
powerpc-specific code and could only be enabled on powerpc.

* 'irqdomain/merge' of git://git.secretlab.ca/git/linux-2.6:
  irqdomain/powerpc: updated defconfigs for VIRQ_DEBUG rename
  irqdomain: Remove powerpc dependency from debugfs file