diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-22 07:38:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-22 07:38:21 -0700 |
| commit | 9617ba395f05f2f836d078363463f8978b0f73bc (patch) | |
| tree | 27e26727dd9cff328401bd064e140a6fa3e8e7f1 /drivers/ide/ide-timings.c | |
| parent | 20a9e57a09d32c9149e065b73b714b9681349619 (diff) | |
| parent | c84ca616b1260949782f408271336f0eda056c61 (diff) | |
| download | linux-9617ba395f05f2f836d078363463f8978b0f73bc.tar.gz linux-9617ba395f05f2f836d078363463f8978b0f73bc.tar.bz2 linux-9617ba395f05f2f836d078363463f8978b0f73bc.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:
"Nothing super serious:
- Convert sparc32 over to NO_BOOTMEM (Mike Rapoport)
- Use dma_noncoherent_ops on sparc32 (Christoph Hellwig)
- Fix kbuild defconfig handling on sparc32 (Masahiro Yamada)"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: fix KBUILD_DEFCONFIG for ARCH=sparc32
sparc32: split ramdisk detection and reservation to a helper function
sparc32: switch to NO_BOOTMEM
sparc: mm/init_32: kill trailing whitespace
sparc: use generic dma_noncoherent_ops
Diffstat (limited to 'drivers/ide/ide-timings.c')
0 files changed, 0 insertions, 0 deletions