diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-13 00:33:16 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-13 00:33:16 +0200 |
commit | b3dfd76c945b879513b991bac23ffcb97fe88ec2 (patch) | |
tree | fa5044e39dc816293ebf46cbb208443039eec7c5 /drivers/ide/palm_bk3710.c | |
parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | irq_domain: fix type mismatch in debugfs output format (diff) | |
download | linux-b3dfd76c945b879513b991bac23ffcb97fe88ec2.tar.xz linux-b3dfd76c945b879513b991bac23ffcb97fe88ec2.zip |
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
Diffstat (limited to 'drivers/ide/palm_bk3710.c')
0 files changed, 0 insertions, 0 deletions