| commit | 0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 26 12:43:57 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 26 12:43:57 2012 -0800 |
| tree | 93eefb55eb9a9e41053e6de032e49e92c7be5574 | |
| parent | 87f71ae2dd7471c1b4c94100be1f218e91dc64c3 [diff] | |
| parent | 2a3535069e33d8b416f406c159ce924427315303 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Fix assembler constraint to prevent overeager gcc optimisation mac_esp: rename irq mac_scsi: dont enable mac_scsi irq before requesting it macfb: fix black and white modes m68k/irq: Remove obsolete IRQ_FLG_* definitions Fix up trivial conflict in arch/m68k/kernel/process_mm.c as per Geert.