diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-10 18:26:54 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-10 18:27:03 -0500 |
| commit | 51327ada7142ab520ed610a42572d1f4cbfbb2dc (patch) | |
| tree | 3dd587e6322073d0f8847ef92a835fd9fe456b49 /drivers/atm/solos-pci.c | |
| parent | 44951a60ff888add9e84f509ffce20052e45af94 (diff) | |
| parent | 986c011ddbb3ed44b35e1bfd67f6aa60b293b495 (diff) | |
Merge branch 'irq/for-mips' into irq/core
Reason: irq/for-mips is provided for mips to make core independent
progress. Merge it into irq/core to avoid conflicts
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/atm/solos-pci.c')
0 files changed, 0 insertions, 0 deletions