Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
[cascardo/linux.git] / arch / microblaze / include / asm / hw_irq.h
1