Merge branch 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Browse source

* 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k, m68knommu: Do not include linux/hardirq.h in asm/irqflags.h
  m68knommu: add back in declaration of do_IRQ

...

This commit is contained in:

Linus Torvalds 2010-11-05 07:54:40 -07:00

parent ff8b16d7e1 ed35f654e4

commit 9a8a0cadde

2 changed files with 3 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/m68k/include/asm/irqflags.h

View file

1

arch/m68k/include/asm/machdep.h

View file