Yury G. Kudryashov e5917ea6fc Merge with udev-173 ... The only conflict was the addition of two different options at the same place. svn path=/nixos/trunk/; revision=28801		2011-08-24 21:24:39 +00:00
..
acpid.nix	* Make acpid depend on syslogd (to prevent it printing startup	2010-07-09 12:35:06 +00:00
bluetooth.nix	* Include the Bluetooth module in module-list.nix.	2010-08-27 15:32:49 +00:00
hal.nix	* Don't enable HAL by default anymore. It's obsolete. It's still	2011-07-25 00:52:59 +00:00
pcscd.nix	Fixing the pcscd job (daemonType)	2010-05-18 17:57:03 +00:00
udev.nix	Merge with udev-173	2011-08-24 21:24:39 +00:00
udisks.nix	Merge with udev-173	2011-08-24 21:24:39 +00:00
upower.nix	Merge with udev-173	2011-08-24 21:24:39 +00:00