diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-08 10:46:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-08 10:46:27 +0200 |
| commit | 7cd2541cf2395962daf98ec32a141aba3398a9b2 (patch) | |
| tree | 3c8bebb277462ba0de9d44233a970d34056dc45e /arch/mips/jazz/irq.c | |
| parent | perf, gcc-4.6: Fix set but unused variable (diff) | |
| parent | Linux 2.6.36-rc7 (diff) | |
| download | linux-7cd2541cf2395962daf98ec32a141aba3398a9b2.tar.xz linux-7cd2541cf2395962daf98ec32a141aba3398a9b2.zip | |
Merge commit 'v2.6.36-rc7' into perf/core
Conflicts:
arch/x86/kernel/module.c
Merge reason: Resolve the conflict, pick up fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/jazz/irq.c')
0 files changed, 0 insertions, 0 deletions