summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-29 23:11:54 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-29 23:11:54 +0200
commit55a320308902f7a0746569ee57eeb3f254e6ed16 (patch)
tree43c86db843ede6a0c2aeeb147bad78bc209514cc /arch/ia64/include
parentMerge branch 'akpm' (Andrew's patch-bomb) (diff)
parentirqdomain/powerpc: updated defconfigs for VIRQ_DEBUG rename (diff)
downloadlinux-55a320308902f7a0746569ee57eeb3f254e6ed16.tar.xz
linux-55a320308902f7a0746569ee57eeb3f254e6ed16.zip
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
Diffstat (limited to 'arch/ia64/include')
0 files changed, 0 insertions, 0 deletions