From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 29 Mar 2012 21:11:54 +0000 (-0700)
Subject: Merge branch 'irqdomain/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: MMI-PSA29.97-13-9~17128
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=55a320308902f7a0746569ee57eeb3f254e6ed16;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

55a320308902f7a0746569ee57eeb3f254e6ed16