diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-26 21:43:57 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-26 21:43:57 +0100 |
| commit | 0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a (patch) | |
| tree | 93eefb55eb9a9e41053e6de032e49e92c7be5574 /drivers/video/amba-clcd.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | m68k: Fix assembler constraint to prevent overeager gcc optimisation (diff) | |
| download | linux-0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a.tar.xz linux-0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a.zip | |
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.
Diffstat (limited to 'drivers/video/amba-clcd.c')
0 files changed, 0 insertions, 0 deletions