Vladimír Čunát
c1a9dc3d37
Merge branch 'master' into staging
2017-03-23 13:31:28 +01:00
Robin Gloster
785e45ac06
Revert "Revert "kmod-blacklist-ubuntu: 9.3 -> 22.1""
...
This reverts commit 8c410f4b18
with a fix
to make the tests run correctly. bochs-drm must not be blacklisted for
that.
2017-03-23 10:10:04 +01:00
Joachim Fasting
94ab4932ae
grsecurity: 4.9.16-201703180820 -> 4.9.17-201703221829
2017-03-23 01:03:14 +01:00
Joachim Fasting
a2fdf72ec4
linux_4_9: 4.9.16 -> 4.9.17
2017-03-23 01:03:11 +01:00
Vladimír Čunát
8c410f4b18
Revert "kmod-blacklist-ubuntu: 9.3 -> 22.1"
...
This reverts commit 0c262a639e
.
It broke X tests, though it's not clear why ATM. Discussion:
https://github.com/NixOS/nixpkgs/pull/23890#issuecomment-288528788
2017-03-22 21:45:22 +01:00
Joachim Fasting
41e2ffa1d7
pax-utils: meta cleanups
...
- Description from upstream
- A more informative homepage
- Per upstream, pax-utils should work for unix-likes beyond linux
2017-03-22 02:27:30 +01:00
Tim Steinbach
c60102d177
linux: 4.11-rc2 -> 4.11-rc3
2017-03-21 20:32:36 -04:00
Frederik Rietdijk
94eb74eaad
Merge remote-tracking branch 'upstream/master' into HEAD
2017-03-21 13:04:37 +01:00
Frederik Rietdijk
3760c8c7fd
Python: replace mkPythonDerivation with buildPythonPackage and format="other";
...
This way all Python packages use the same function,
`buildPythonPackage`.
2017-03-21 13:01:49 +01:00
Jörg Thalheim
818a37598c
wireguard: 0.0.20170223 -> 0.0.20170320.1
2017-03-21 01:46:17 +01:00
Tobias Geerinckx-Rice
4a53b2eaf7
crda: Add usage hint to longDescription.
...
Reported by samae on #nixos.
2017-03-20 23:24:46 +01:00
Benno Fünfstück
8c0074dd9f
drbd: fix output file location ( #23541 )
...
drbd was installing files into $out/nix/store/... due to the usage of DESTDIR
(setting both DESTDIR + prefix to $out will cause files to be installed into $out/$out/...)
2017-03-20 22:25:10 +01:00
Kristoffer Søholm
f9e8ef7e6d
nixos/bluetooth: add extraConfig option ( #23427 )
2017-03-20 14:28:02 +01:00
Tuomas Tynkkynen
addffa41b4
kmscube: 2016-09-19 -> 2017-03-19
2017-03-20 07:27:57 +02:00
Tim Steinbach
bef5607e20
linux: 4.4.54 -> 4.4.55
2017-03-19 12:18:46 -04:00
Tim Steinbach
6879d560cb
linux: 4.10.3 -> 4.10.4
2017-03-19 12:15:40 -04:00
Kosyrev Serge
d860a68fd0
nvidia-x11: $bin can be empty
2017-03-19 05:29:57 +03:00
Kosyrev Serge
d18f55269c
nvidia-x11: don't patch things if libsOnly requested
2017-03-19 05:29:33 +03:00
Michael Raskin
fb26aadbe4
Merge pull request #23689 from sh01/hwdata_hashaddr
...
hwdata: Use content-addressed source file; previous source tarball changes contents.
2017-03-18 19:16:27 +01:00
Michael Raskin
309f10b00c
Merge pull request #23134 from ljli/earlyoom-init
...
earlyoom: init at 0.11
2017-03-18 17:22:57 +01:00
Frederik Rietdijk
06527e8217
Merge remote-tracking branch 'upstream/staging' into HEAD
2017-03-18 15:35:46 +01:00
Joachim Fasting
b5da6ca213
linux_4_9: 4.9.15 -> 4.9.16
2017-03-18 15:32:56 +01:00
Joachim Fasting
d4409817a6
grsecurity: 4.9.15-201703150049 -> 4.9.16-201703180820
2017-03-18 15:32:48 +01:00
Vladimír Čunát
742b120ddc
Merge branch 'master' into staging
...
Nontrivial rebuilds from master, again :-/
2017-03-18 11:00:31 +01:00
Tim Steinbach
ca3fb4d1d4
linux: 4.4.53 -> 4.4.54
2017-03-17 17:25:40 -04:00
Tim Steinbach
81ad24d4d7
linux: 4.10.2 -> 4.10.3
2017-03-17 17:19:59 -04:00
Peter Hoeg
cb73e06989
Merge pull request #23890 from peterhoeg/u/kmod
...
kmod: 23 -> 24 and update kmod-blacklist-ubuntu to zesty
2017-03-17 16:01:09 +08:00
Joachim Fasting
12648a455b
linux_4_9: 4.9.14 -> 4.9.15
2017-03-15 20:03:34 +01:00
Vladimír Čunát
e99bc64552
Merge branch 'master' into staging
...
More larger rebuilds from master, unfortunately.
2017-03-15 19:09:56 +01:00
Joachim Fasting
9e60a17cb8
grsecurity: 4.9.14-201703121245 -> 4.9.15-201703150049
...
Contains a fix for the n_hdlc double free bug.
2017-03-15 07:25:21 +01:00
Franz Pletz
44bd7c45dc
linux_4_10: 4.10.1 -> 4.10.2
2017-03-14 23:08:43 +01:00
Franz Pletz
a691c06556
linux_testing: 4.11-rc1 -> 4.11-rc2
2017-03-14 23:08:43 +01:00
Frederik Rietdijk
ad21793dac
Merge pull request #23852 from jlesquembre/conky_1.10.6
...
conky: 1.10.5 -> 1.10.6
2017-03-14 13:37:26 +01:00
Peter Hoeg
89724f152a
kmod: 23 -> 24
2017-03-14 18:06:55 +08:00
Peter Hoeg
605ee9e92b
kmod-blacklist-ubuntu: do not blacklist i2c_i801
2017-03-14 18:06:44 +08:00
Peter Hoeg
0c262a639e
kmod-blacklist-ubuntu: 9.3 -> 22.1
2017-03-14 18:06:29 +08:00
Peter Hoeg
80750f459c
Merge pull request #17303 from peterhoeg/iio
...
iio-sensor-proxy: init at 2.2 and nixos module
2017-03-14 11:16:09 +08:00
Tim Steinbach
18684a4892
linux: 4.1.38 -> 4.1.39
2017-03-13 20:15:42 -04:00
Tim Steinbach
9ac82a773c
linux: 4.4.52 -> 4.4.53
2017-03-13 20:15:26 -04:00
Tuomas Tynkkynen
aba0b45b86
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
2017-03-14 00:49:22 +02:00
José Luis Lafuente
c70ded3295
conky: 1.10.5 -> 1.10.6
2017-03-13 18:18:42 +01:00
Tuomas Tynkkynen
b2c96062ca
kernel: Add a validity check for modDirVersion
...
Because if you get it wrong, you get a very confusing error message at
the end of the kernel build, which is quite painful as the build can
take a long time.
2017-03-13 18:47:21 +02:00
Vladimír Čunát
8bfa9f528c
syslinux: fixup build via a Debian patch
...
It stopped working probably since binutils update.
2017-03-13 15:40:43 +01:00
Cray Elliott
8799254eac
nvidia_x11_beta: add patch to support Linux 4.10.x
...
thanks to bendlas for the review for pointing out a way to grab the patch remotely!
2017-03-13 00:00:26 -07:00
Cray Elliott
12083de992
nvidia_x11: 375.26 -> 375.39
...
nvidia_x11_beta: 378.09 -> 378.13
2017-03-12 23:54:08 -07:00
Joachim Fasting
8091c1b208
linux_4_9: 4.9.13 -> 4.9.14
2017-03-12 18:44:29 +01:00
Joachim Fasting
4c211bdc63
grsecurity: 4.9.13-201703052141 -> 4.9.14-201703121245
2017-03-12 18:44:27 +01:00
Franz Pletz
c3c69535aa
firmwareLinuxNonfree: 2017-02-06 -> 2017-03-11
...
Fixes #22365 .
2017-03-11 15:03:57 +01:00
Franz Pletz
71161443b4
batman-adv: 2016.5 -> 2017.0.1
2017-03-11 09:39:20 +01:00
Franz Pletz
c1ccedeaff
linux: make some new config settings optional
...
These are not support on older kernels pre 4.0.
2017-03-11 08:14:29 +01:00
Franz Pletz
ff2313a6c6
linux: 3.12.70 -> 3.12.71
2017-03-11 08:14:29 +01:00
Franz Pletz
3bd44428cf
lxc: add patch for CVE-2017-5985
2017-03-11 08:14:28 +01:00
Tuomas Tynkkynen
77c49794cd
linux_testing: 4.10-rc7 -> 4.11-rc1
...
Some config options got removed, so conditionalize them.
2017-03-11 01:27:06 +02:00
Sebastian Hagen
00f16e3d7c
hwdata: Use content-addressed source file; previous source tarball changed contents.
2017-03-10 05:14:14 +00:00
Tuomas Tynkkynen
5f5b87107f
raspberrypifw, linux_rpi: 1.20161020 -> 1.20170303
2017-03-08 21:35:31 +02:00
Jörg Thalheim
94497a0ef3
lxcfs: 2.0.4 -> unstable-2017-03-02
2017-03-06 22:54:28 +00:00
Jörg Thalheim
46ba5acd82
dmtcp: 2.3.1 -> 2.5.0
2017-03-06 22:01:12 +01:00
Joachim Fasting
17d80c49fa
grsecurity: 4.9.13-201702270729 -> 201703052141
2017-03-06 15:59:30 +01:00
Jörg Thalheim
b4f5bce607
android-udev-rules: 20170208 -> 20170305
2017-03-06 13:53:01 +01:00
Tuomas Tynkkynen
57c6fac3e9
kernel config: Enable IP_MULTICAST
...
This is lacking on ARM and causes libuv tests to fail.
2017-03-04 12:49:50 +02:00
Alexander Kirchhoff
3948891112
pam_ssh_agent_auth: Re-allow multiple authorized keys files
...
This functionality was initially introduced in
3644f9124a
to fix
https://github.com/NixOS/nixos/pull/52 , but was broken in the update from 0.9.5
to 0.10.3. The original patch does not cleanly apply due to reformatting and
parameter changes upstream, but the adaptations of the patch to the new version
are not too severe.
2017-03-03 01:11:53 -08:00
Franz Pletz
49bdf9803a
linux: IPV6_FOU_TUNNEL is available since 4.7
2017-03-02 17:19:55 +01:00
Franz Pletz
75e85cae42
linux: enable FOU tunnels and VRF interfaces
2017-03-02 17:19:55 +01:00
Joachim Fasting
c5785dc3eb
nvidiabl: mark as broken on kernels >4.4
...
All builds on kernels >4.4 fail.
2017-03-02 16:11:42 +01:00
Joachim Fasting
499f813ae8
nvidiabl: 0.85 -> 0.87
2017-03-02 16:11:18 +01:00
Joachim Fasting
7f31a8e359
cryptodev: mark as broken for kernels >4.4
...
All builds for kernels above 4.4 fail; there is no newer
upstream version.
2017-03-02 16:11:16 +01:00
Tuomas Tynkkynen
256e764226
radeontools: Mark as broken
...
The upstream release is from 2004. The website of this software talks
about configuring XFree86. I *highly* doubt this software is of any use
nowadays.
2017-03-02 02:30:00 +02:00
Tobias Geerinckx-Rice
b12b4eaca6
phc-intel: 0.4.0-rev22 -> 0.4.0-rev24
...
Fixes Hydra failures on kernel >= 4.10 by only supporting kernel >= 4.10.
2017-03-01 23:34:37 +01:00
Tuomas Tynkkynen
0495b34782
trinity: Apply upstream commit as a patch to fix build
...
Needed since glibc 2.25.
2017-03-01 18:03:30 +02:00
Vladimír Čunát
b43614a6bb
Merge branch 'staging'
...
(Truly, this time :-)
2017-03-01 11:34:44 +01:00
Joachim Fasting
ab6d358ebf
openisns: fix empty lib output
...
Looks like enable-shared defaults to false, so we actually
ended up with no usable object files in the lib output.
This also appears to have broken open-iscsi, as evinced by
/nix/store/[...]-binutils-2.27/bin/ld: cannot find -lisns
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:57: iscsid] Error 1
https://hydra.nixos.org/build/49437400/log/raw
With this patch, open-iscsi builds fine here.
2017-03-01 01:48:51 +01:00
Bjørn Forsman
fc8e0ccc2e
sysdig: give the source tarball a meaningful name
2017-02-28 17:58:03 +01:00
Jörg Thalheim
c6375407ec
Merge pull request #23281 from makefu/pkgs/exfat-nofuse/min-kernel
...
exfat-nofuse: exclude 4.1 kernel build
2017-02-28 16:58:11 +01:00
Jörg Thalheim
479c6c1ef0
sysdig: 0.14.0 -> 0.15.0
2017-02-28 16:41:08 +01:00
makefu
b4ff1ba4a9
exfat-nofuse: exclude 4.1 kernel build
2017-02-28 16:28:23 +01:00
Franz Pletz
40e84506ec
linuxPackages.ixgbevf: 3.2.2 -> 4.0.3
...
cc #23253
2017-02-28 16:00:56 +01:00
Franz Pletz
163db1bbf9
linuxPackages.e1000e: 3.3.1 -> 3.3.5.3
...
cc #23253
2017-02-28 16:00:56 +01:00
Jörg Thalheim
dc7d4dcbb5
Merge pull request #23278 from makefu/pkgs/exfat-nofuse/pin-kernel
...
exfat-nofuse: build only for kernels < 4.10
2017-02-28 15:56:44 +01:00
makefu
af7ccaf8c8
exfat-nofuse: build only for kernels < 4.10
2017-02-28 15:50:15 +01:00
Franz Pletz
d733d36cc6
linuxPackages.jool: only supported on linux < 4.10
...
cc #23253
2017-02-28 14:47:04 +01:00
Franz Pletz
616e5c1953
linuxPackages.sch_cake: only supported in linux >= 4.4
...
cc #23253
2017-02-28 14:46:39 +01:00
Shea Levy
e292d166e8
fwupd: Fix localstatedir
2017-02-27 15:28:43 -05:00
Vladimír Čunát
a1919db7cd
Merge branch 'master' into staging
2017-02-27 20:15:27 +01:00
Shea Levy
2edb8ffa14
fwupd: 0.8.0 -> 0.8.1.
2017-02-27 10:07:57 -05:00
Joachim Fasting
a20a53300d
grsecurity: 4.9.13-201702261126 -> 201702270729
2017-02-27 16:04:32 +01:00
Shea Levy
1230330b14
fwupd: Fix systemd/udev install
2017-02-27 08:45:14 -05:00
Shea Levy
8307307e4e
fwupd: Init at 0.8.0
2017-02-27 08:38:49 -05:00
Shea Levy
40e136542e
fwupdate: init at 8
2017-02-27 08:35:08 -05:00
Shea Levy
72ff466de3
libsmbios: 2.2.28 -> 2.3.2
2017-02-27 08:30:46 -05:00
Robin Gloster
8d95889fe6
xf86_input_multitouch: fix build
2017-02-27 13:34:41 +01:00
Bjørn Forsman
3d104ab2b3
gst-plugins-base: align attrname with pkgname
2017-02-27 12:16:26 +01:00
Joachim Fasting
f3a6991f3d
grsecurity: 4.9.12-201702231830 -> 4.9.13-201702261126
2017-02-26 18:20:50 +01:00
Franz Pletz
701544d0a7
linux: 4.9.12 -> 4.9.13
2017-02-26 18:09:16 +01:00
Franz Pletz
62857b1f21
linux: 4.4.51 -> 4.4.52
2017-02-26 18:09:16 +01:00
Franz Pletz
8a75569619
linux: 4.10 -> 4.10.1
2017-02-26 18:09:15 +01:00
Graham Christensen
8b40d2e305
mcelog: 144 -> 148
2017-02-26 09:16:01 -05:00
Joachim Fasting
0150d9a95c
grsecurity: 4.9.11-201702222257 -> 4.9.12-201702231830
2017-02-26 14:01:57 +01:00
Peter Hoeg
a85b55e4cd
microcode-intel: 20160714 -> 20161104
2017-02-26 18:25:25 +08:00
Matthew Robbetts
b9418091f4
hostapd: libressl patches.
2017-02-25 10:15:53 +01:00
Franz Pletz
9d14ea4295
utillinux: 2.29 -> 2.29.2 for CVE-2017-2616
...
cc #23072
2017-02-25 09:40:36 +01:00
Peter Hoeg
e4d8cb8dab
iio-sensor-proxy: init at 2.2 and nixos module
...
This PR adds support for ```iio-sensor-proxy``` used by GNOME v3 and
others for reading data from the accelerometer, gps, compass and similar sensors
built into some relatively recent laptops.
Additionally, there is a NixOS module exposed via hardware.sensor.iio
for enabling services, udev rules and dbus services.
2017-02-25 08:46:46 +08:00
Franz Pletz
7eb7126f5a
Revert "lxc: fix build for glibc-2.25"
...
This reverts commit 76ae7e19a9
.
2017-02-24 21:45:29 +01:00
Franz Pletz
76ae7e19a9
lxc: fix build for glibc-2.25
2017-02-24 17:57:41 +01:00
Franz Pletz
f15cebd28c
jool: 3.5.0 -> 3.5.2
2017-02-24 17:57:41 +01:00
Jörg Thalheim
0eefe9bc62
lxc: fix glibc 2.25 incompatibility
2017-02-24 14:00:23 +01:00
Leon Isenberg
5abc164e2d
earlyoom: init at 0.11
2017-02-24 08:19:12 +01:00
Graham Christensen
d36b1ccc13
Revert "Revert "linux kernels: patch against DCCP double free (CVE-2017-6074)""
...
This reverts commit 53a2baabbe
.
2017-02-23 19:23:29 -05:00
Graham Christensen
53a2baabbe
Revert "linux kernels: patch against DCCP double free (CVE-2017-6074)"
...
This reverts commit 1d68edbef4
.
2017-02-23 18:47:16 -05:00
Graham Christensen
1d68edbef4
linux kernels: patch against DCCP double free (CVE-2017-6074)
2017-02-23 18:44:43 -05:00
Tim Steinbach
82aae8f631
kernel: 4.4.50 -> 4.4.51
2017-02-23 17:47:51 -05:00
Tim Steinbach
18c2be2862
kernel: 4.9.11 -> 4.9.12
2017-02-23 17:47:18 -05:00
Joachim Fasting
b92501f0d8
grsecurity: 4.9.11-201702181444 -> 201702222257
2017-02-23 19:18:39 +01:00
Jason A. Donenfeld
67b4f726c8
wireguard: 0.0.20170214 -> 0.0.20170223
...
Simple version bump.
2017-02-23 19:07:42 +01:00
Nikolay Amiantov
fd29b10606
linuxPackages.lttng-modules: 2.8.3 -> 2.9.1
2017-02-23 13:04:23 +03:00
Vladimír Čunát
145d3ea81c
Merge branch 'master' into staging
2017-02-22 17:47:49 +01:00
Vladimír Čunát
7ccd6f25f0
reptyr: fixup build with glibc-2.25
2017-02-22 16:54:40 +01:00
Jörg Thalheim
5b14e91717
Merge pull request #22822 from Mic92/iputils
...
iputils: 20151218 -> 20161105
2017-02-22 00:37:13 +01:00
Vladimír Čunát
c986f4f894
fatrace: fixup build with glibc-2.25
2017-02-21 19:03:36 +01:00
Vladimír Čunát
cbc343e5e7
criu: fixup build with glibc-2.25
2017-02-21 18:21:01 +01:00
Franz Pletz
6fd27c7c38
linuxPackages.sch_cake: init at 2017-01-28
2017-02-21 08:24:35 +01:00
Shea Levy
f454297a7d
linux 4.10
2017-02-20 07:32:46 -05:00
Shea Levy
b191ac0d89
Revert "linux 4.10"
...
Somehow the tarball was actually linux 4.4.10
This reverts commit fea71f84d0
.
2017-02-20 07:29:47 -05:00
Shea Levy
fea71f84d0
linux 4.10
2017-02-20 06:47:49 -05:00
Nikolay Amiantov
22750b36fd
nvidia: support application profiles
...
Closes #22666 .
2017-02-19 19:46:01 +03:00
Nikolay Amiantov
f6eedf0867
nvidia-x11.settings: add librsvg for gtk3
2017-02-19 19:45:54 +03:00
Michael Raskin
511f82d6e5
fbterm: install terminfo definition
...
Hopefully helps with #22988
2017-02-19 17:29:48 +01:00
Tuomas Tynkkynen
9483359887
linuxPackages.tp_smapi: Use common-updater/update-source-version script
...
This way we have the benefit of the usual Nixpkgs style, and gain a
slight reduction in amount of code in the updater.
Also use callPackage to reduce duplication of the dependencies of the
update script and use makeBinPath to make things neater.
2017-02-19 16:51:17 +02:00
Nikolay Amiantov
362ef377c8
nvidia_x11.settings: link dlopen'ed libraries
2017-02-19 11:53:23 +03:00
Tim Steinbach
7274fc32d2
linux: 4.4.48 -> 4.4.50
2017-02-18 18:40:04 -05:00
Tim Steinbach
2423313581
kernel: 4.9.10 -> 4.9.11
2017-02-18 18:33:36 -05:00
Robin Gloster
9326a89910
lvm: add missing dependency
...
fixes #14394
2017-02-18 23:17:14 +01:00
Joachim Fasting
ca016c2626
grsecurity: 4.9.10-201702152052 -> 4.9.11-201702181444
2017-02-18 22:01:16 +01:00
Cray Elliott
5e0b978eff
mwprocapture: init at 1.2.3269 ( #22160 )
2017-02-18 15:44:31 +01:00
obadz
db95097674
syscall_limiter: 20160105 -> 20170123
2017-02-18 10:42:59 +00:00
Vladimír Čunát
432dba859e
Merge branch 'staging'
...
A security update of libxml2 is within.
2017-02-18 08:59:29 +01:00
Joachim Fasting
e8007c0e89
linux_4_9: patch for CVE-2017-5986
...
Seems fairly low impact[1] but we might as well patch it until a new 4.9
version is released
[1]: https://bugzilla.redhat.com/show_bug.cgi?id=1420276
2017-02-17 19:11:30 +01:00
Joachim Fasting
73577a2b05
linux_4_9: 4.9.9 -> 4.9.10
2017-02-17 19:11:24 +01:00
Robin Gloster
643703366d
pam_ssh_agent_auth: 0.9.5 -> 0.10.3
2017-02-17 00:12:01 +01:00
Robin Gloster
96b4d69136
openisns: 0.95 -> 0.97
2017-02-17 00:11:58 +01:00
Robin Gloster
df58ed2f13
hostapd: 2.5 -> 2.6
2017-02-17 00:11:37 +01:00
Robin Gloster
31ff2ac057
systemd: add patch to fix docker
...
843d5baf6a
"don't use the unified hierarchy for the systemd cgroup yet"
fixes #22472
2017-02-16 23:56:27 +01:00
Joachim Fasting
bc2f53fd29
grsecurity: 4.9.8-201702071801 -> 4.9.10-201702152052
2017-02-16 14:51:25 +01:00
Jörg Thalheim
a674dea675
iputils: 20151218 -> 20161105
...
most notable change is the removal of tracepath6 and ping6
2017-02-15 11:26:17 +01:00
Joachim Fasting
9d8a0f8dd8
pax-utils: 1.1.7 -> 1.2.2
...
Fixes at least a few out-of-bounds reads[1][2]
[1]: http://seclists.org/oss-sec/2017/q1/256
[2]: http://seclists.org/oss-sec/2017/q1/308
2017-02-15 05:37:50 +01:00
Eelco Dolstra
314dd9215b
Merge pull request #16654 from awakenetworks/parnell/setcap-wrappers
...
Adding setcap-wrapper functionality to Nix
2017-02-14 16:25:06 +01:00
Graham Christensen
cc442cbdba
Merge pull request #22786 from zx2c4/patch-4
...
wireguard: 0.0.20170213 -> 0.0.20170214
2017-02-14 08:20:41 -05:00
Graham Christensen
1a9707de24
wireguard: update description to describe its current state
2017-02-14 08:20:19 -05:00
Jason A. Donenfeld
36d50978b2
wireguard: 0.0.20170213 -> 0.0.20170214
...
This has a quick fix for old bash.
2017-02-14 12:08:58 +01:00
Tim Steinbach
0ec9e695c8
linux: 3.10.104 -> 3.10.105
2017-02-13 18:47:01 -05:00
Parnell Springmeyer
9e36a58649
Merging against upstream master
2017-02-13 17:16:28 -06:00