diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 19:10:52 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 19:10:52 +0200 |
commit | ceb198bb007b84ead867e87a71ffe715c4412b15 (patch) | |
tree | 2d933558cdef1f0e8e7f8efed8b1444a5558fa04 /block/genhd.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff) | |
parent | nubus: Add MVC and VSC video card definitions (diff) | |
download | linux-ceb198bb007b84ead867e87a71ffe715c4412b15.tar.xz linux-ceb198bb007b84ead867e87a71ffe715c4412b15.zip |
Merge tag 'm68k-for-v4.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- more kernel message modernizations and cleanups
- Mac and Nubus improvements and cleanups.
* tag 'm68k-for-v4.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
nubus: Add MVC and VSC video card definitions
nubus: Clean up whitespace
nubus: Clean up printk calls
nubus: Fix nubus_rewinddir
m68k/mac: Clarify IOP message alloc/free confusion
m68k/mac: Adopt platform_device_register_simple()
m68k/mac: Modernize printing of kernel messages
m68k/mac: IOP - Modernize printing of kernel messages
Diffstat (limited to 'block/genhd.c')
0 files changed, 0 insertions, 0 deletions