summaryrefslogtreecommitdiff
path: root/ioops.h
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2014-08-15 16:17:48 +0200
committerTobias Klauser <tklauser@distanz.ch>2014-08-15 16:17:48 +0200
commite1b4e7c88fdd8dbb64dae7b9a14d2c13e3751015 (patch)
tree996816df6809a5b1885fc79280fd25751f6872ef /ioops.h
parentcd3bc1457bcb4f22c232a5808fb895c2798ca164 (diff)
conf: oui: update oui.conf
Update oui.conf using oui-update.py Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'ioops.h')
0 files changed, 0 insertions, 0 deletions
m?h=nds-private-remove&id=23fbe2cdc1de80120cf9ccd478ac57c3a3a0764b&id2=eeeefd41843218c55a8782a6920f044d9bf6207a'>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/xfrm')