Domen Kožar bb4d658f64 Merge branch 'master' into staging ... Conflicts: nixos/doc/manual/release-notes/rl-unstable.xml nixos/modules/services/printing/cupsd.nix pkgs/applications/misc/calibre/default.nix pkgs/development/haskell-modules/hackage-packages.nix pkgs/development/libraries/libsodium/default.nix pkgs/misc/emulators/wine/unstable.nix pkgs/top-level/all-packages.nix		2015-05-11 10:05:23 +02:00
..
apparmor-patches
bridge-stp-helper.patch	kernel: Fix path to stp bridge helper	2015-01-14 10:34:28 -08:00
common-config.nix	linux: disable UEVENT_HELPER by default on versions >= 3.15	2015-04-06 14:00:03 +02:00
crc-regression.patch	linux_3_{10,12,14}: fix upstream regression, fixes #6231	2015-02-10 13:45:20 +01:00
generate-config.pl
generic.nix	linux kernel determinism: unify timestamp style	2015-01-03 13:54:32 +01:00
grsec-path.patch	grsec_path: Update patch	2015-04-15 16:22:42 -07:00
linux-3.2.nix	kernel: 3.2.67 -> 3.2.68	2015-03-08 14:57:44 -07:00
linux-3.4.nix	kernel: 3.4.106 -> 3.4.107	2015-04-17 16:55:14 -07:00
linux-3.10.nix	kernel: 3.10.76 -> 3.10.77	2015-05-07 19:26:20 -07:00
linux-3.12.nix	kernel: 3.12.40 -> 3.12.42	2015-05-07 19:26:48 -07:00
linux-3.14.nix	kernel: 3.14.40 -> 3.14.41	2015-05-07 20:34:26 -07:00
linux-3.18.nix	kernel: Remove obsolete btrfs patch	2015-05-08 05:27:55 -07:00
linux-3.19.nix	kernel: Move grsecurity update warning	2015-05-07 20:45:48 -07:00
linux-4.0.nix	kernel: Move grsecurity update warning	2015-05-07 20:45:48 -07:00
linux-rpi.nix	Updating the raspberry pi kernel sources to recent, for pi2	2015-03-05 09:09:32 +00:00
linux-testing.nix	linux-testing: 4.0-rc6 -> 4.0-rc7	2015-04-06 20:12:08 -07:00
linux.upstream.template
manual-config.nix	kernel: Install DTBs into a subdirectory	2015-05-07 06:04:10 +03:00
mips-ext3-n32.patch
mips-fpu-sigill.patch
mips-fpureg-emulation.patch
no-xsave.patch
patches.nix	grsecurity: Update stable and test patches	2015-05-11 02:45:38 +02:00
perf.diff
perf.nix	perf: Use libunwind and libbfd	2015-03-11 18:15:48 +01:00
update.sh