diff options
author | Linus Torvalds | 2016-01-18 12:28:57 -0800 |
---|---|---|
committer | Linus Torvalds | 2016-01-18 12:28:57 -0800 |
commit | 7f36f1b2a8c4f55f8226ed6c8bb4ed6de11c4015 (patch) | |
tree | 3d6f138321ce8c1fbf227498d9e4dc9181caafa0 /net/unix | |
parent | c38dec71664dadb15094151f53886abb69f8f9e6 (diff) | |
parent | e04a2bd6d8c95608cbb2c803ee2875cebfd89f52 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE updates from David Miller:
"Just a few small changes this merge window, marking ops const, printf
string type fixes, etc"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
drivers/ide: make ide-scan-pci.c driver explicitly non-modular
ide: constify ide_dma_ops structures
ide: silence some underflow warnings
Diffstat (limited to 'net/unix')
0 files changed, 0 insertions, 0 deletions