Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' ... Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix		2015-02-02 21:14:28 -05:00
..
apparmor-patches	kernel: enable AppArmor by default	2014-05-17 14:09:09 -05:00
bridge-stp-helper.patch	kernel: Fix path to stp bridge helper	2015-01-14 10:34:28 -08:00
common-config.nix	linux-testing: Update to version 3.19-rc5.	2015-01-22 09:56:37 +01:00
generate-config.pl
generic.nix	linux kernel determinism: unify timestamp style	2015-01-03 13:54:32 +01:00
grsec-path.patch
linux-3.2.nix	kernel: 3.2.65 -> 3.2.66	2015-01-11 23:55:37 -08:00
linux-3.4.nix	kernel: 3.4.104 -> 3.4.105	2014-12-08 23:21:40 -08:00
linux-3.10.nix	kernel: 3.10.65 -> 3.10.67	2015-01-31 17:46:04 -08:00
linux-3.12.nix	kernel: 3.12.36 -> 3.12.37	2015-02-01 10:57:47 +03:00
linux-3.14.nix	kernel: 3.14.29 -> 3.14.31	2015-01-31 18:55:09 -08:00
linux-3.17.nix	kernel: 3.17.7 -> 3.17.8	2015-01-11 23:55:37 -08:00
linux-3.18.nix	kernel: 3.18.3 -> 3.18.5	2015-01-31 18:54:59 -08:00
linux-rpi-3.6.nix
linux-testing.nix	linux-testing: Update to version 3.19-rc7.	2015-02-02 19:50:56 +01:00
linux.upstream.template
manual-config.nix	linux kernel determinism: unify timestamp style	2015-01-03 13:54:32 +01:00
mips-ext3-n32.patch
mips-fpu-sigill.patch
mips-fpureg-emulation.patch
no-xsave.patch
patches.nix	kernel: 3.14.29 -> 3.14.31	2015-01-31 18:55:09 -08:00
perf.diff
perf.nix	*: fix builds by disregarding warning from new glibc	2014-11-26 23:40:03 +01:00
update.sh	kernel: Add update script	2014-10-30 14:37:22 -07:00