diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-12 15:33:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-12 15:33:16 -0700 |
| commit | b3dfd76c945b879513b991bac23ffcb97fe88ec2 (patch) | |
| tree | fa5044e39dc816293ebf46cbb208443039eec7c5 /kernel/kprobes.c | |
| parent | 9b1ef1de20e2658c77cce89941f45525704ab534 (diff) | |
| parent | 5269a9ab7def9a3116663347d59c4d70afa2d180 (diff) | |
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 'kernel/kprobes.c')
0 files changed, 0 insertions, 0 deletions