Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Browse source

Pull m68k changes from Geert Uytterhoeven:
 "Extremely non-spectacular changes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/sun3: Remove define statement no longer needed
  zorro: Use ARRAY_SIZE

...

This commit is contained in:

Linus Torvalds 2014-08-04 15:52:51 -07:00

parent 489f50be56 9117710a59

commit a45c657f28

2 changed files with 2 additions and 6 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

4

arch/m68k/include/asm/sun3_pgalloc.h

View file

4

drivers/zorro/names.c

View file