641f956581
(my git-svn info:) Merge branch 'mips64' into stdenv-updates Conflicts: pkgs/applications/networking/browsers/firefox/3.6.nix pkgs/top-level/all-packages.nix svn path=/nixpkgs/branches/stdenv-updates/; revision=23588 |
||
---|---|---|
.. | ||
aufs2-34.patch | ||
aufs2-35.patch | ||
aufs2.patch | ||
builder.sh | ||
cifs-timeout.patch | ||
config-2.6.31-armv5tel | ||
config-blocks.nix | ||
dell-rfkill.patch | ||
generate-config.pl | ||
generic.nix | ||
linux-2.6.25.nix | ||
linux-2.6.27.nix | ||
linux-2.6.28.nix | ||
linux-2.6.29.nix | ||
linux-2.6.31.nix | ||
linux-2.6.32.nix | ||
linux-2.6.33.nix | ||
linux-2.6.34.nix | ||
linux-2.6.35.nix | ||
linux-nanonote-jz-2.6.34.nix | ||
linux-nanonote-jz-2.6.35.nix | ||
patches.nix | ||
sec_perm-2.6.24.patch |