nixpkgs/pkgs/misc/uboot
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
..
default.nix
gas220.patch
guruplug-file-systems.patch
guruplug-usb-msd-multi-lun.patch
guruplug.nix
nanonote.nix svn merge ^/nixpkgs/trunk 2012-01-08 16:01:12 +00:00
sheevaplug.nix