summaryrefslogtreecommitdiff
path: root/debian/patches/debian
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2014-11-06 21:57:46 +0000
committerBen Hutchings <benh@debian.org>2014-11-06 21:57:46 +0000
commit78d8475ba2516399c38abde59025f20b33bd8e3d (patch)
treed081316bd4a32e1b098f76f2aa856bb2f36b3e90 /debian/patches/debian
parent5eb5c2f9b4f3953d066963bcfb8d50e9df76e570 (diff)
parentc5365c420ab4034b54a17a6d0db4d32cc8f8432f (diff)
Merge changes from sid up to 3.16.7-2
svn path=/dists/trunk/linux/; revision=22054
Diffstat (limited to 'debian/patches/debian')
-rw-r--r--debian/patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch b/debian/patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch
index b766ca04f..fe1f55f56 100644
--- a/debian/patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch
+++ b/debian/patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch
@@ -1,6 +1,7 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Fri, 12 Sep 2014 13:24:26 +0100
Subject: i2o: Disable I2O_EXT_ADAPTEC on 64-bit
+Forwarded: no
The code it enables works uses 32-bit numbers for userland virtual
addresses: