From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Apr 2012 22:33:16 +0000 (-0700)
Subject: Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b3dfd76c945b879513b991bac23ffcb97fe88ec2;p=linux-beck.git

Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6

Pull a fix for the recent irqdomain bug fixes from Grant Likely:
 "I flubbed one patch in the last pull request which broke a format
  string on 64 bit platforms.  Here's the fix."

* tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  irq_domain: fix type mismatch in debugfs output format
---

b3dfd76c945b879513b991bac23ffcb97fe88ec2