summaryrefslogtreecommitdiff
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-16 08:20:13 (GMT)
committerIngo Molnar <mingo@elte.hu>2009-03-16 08:20:13 (GMT)
commitedb35028e40515beb2f94808aff8b3e71fb9f35a (patch)
tree153da9f8ca1934b30474bb15478feb14a7bd5b75 /drivers/pcmcia
parent8f8573ae9f5deefada6f5d64d0a52c9b39c730c7 (diff)
parentcb065c06b6cc615a58860d619d7fa7952cd6a18b (diff)
parent5bee17f18b595937e6beafeee5197868a3f74a06 (diff)
downloadlinux-fsl-qoriq-edb35028e40515beb2f94808aff8b3e71fb9f35a.tar.xz
Merge branches 'irq/genirq' and 'linus' into irq/core