summaryrefslogtreecommitdiff
path: root/oui.conf
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2016-01-29 11:55:01 +0100
committerTobias Klauser <tklauser@distanz.ch>2016-01-29 11:55:01 +0100
commit56ce71c166cdfeab7cb503d538fd176ec4548e05 (patch)
treedaad03bf571df99584a2341de4c9a00aec25771d /oui.conf
parentd069c6ebbb4bc56d90a502d0125c97b797f241af (diff)
AUTHORS: Add Erik for his contribution
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'oui.conf')
0 files changed, 0 insertions, 0 deletions
7bf0d04a02eed6742'>diff)parenteeeefd41843218c55a8782a6920f044d9bf6207a (diff)
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fix from Jens Axboe: "A single fix that should go into 4.10, fixing a regression on some devices with the WRITE_SAME command" * 'for-linus' of git://git.kernel.dk/linux-block: block: don't try Write Same from __blkdev_issue_zeroout
Diffstat (limited to 'net/ipv4/tcp_timer.c')