| commit | 3d58f48ba05caed9118bce62b3047f8683438835 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Jun 01 21:06:21 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Jun 01 21:06:21 2009 +0200 |
| tree | 94c911034f0e14ded73d3e9e6e9f8e22b6cad822 | |
| parent | abfe0af9813153bae8c85d9bac966bafcb8ddab1 [diff] | |
| parent | d9244b5d2fbfe9fa540024b410047af13ceec90f [diff] |
Merge branch 'linus' into irq/numa Conflicts: arch/mips/sibyte/bcm1480/irq.c arch/mips/sibyte/sb1250/irq.c Merge reason: we gathered a few conflicts plus update to latest upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>