OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c38dec7
e04a2bd
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
author
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 18 Jan 2016 20:28:57 +0000
(12:28 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 18 Jan 2016 20:28:57 +0000
(12:28 -0800)
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
Trivial merge