patches taken from experimental/x-updates, putting the into its own branch

Conflicts:
	pkgs/os-specific/linux/ati-drivers/default.nix