diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-04 10:12:43 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-04 10:12:43 -0800 |
commit | 1b1050cdc5cdde43177b375b5f22dc070d45d8f8 (patch) | |
tree | ae822c356725775f61cf9091cd20ddcbb2164d35 /net/netfilter | |
parent | b0f85fa11aefc4f3e03306b4cd47f113bd57dcba (diff) | |
parent | 353b39d1b1511376aca71bc3aba62831370561ca (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE fixlet from David Miller:
"Just a y2038 fix to the pdc202xx_new IDE driver"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
ide: pdc202xx_new: Replace timeval with ktime_t
Diffstat (limited to 'net/netfilter')
0 files changed, 0 insertions, 0 deletions