Shea Levy 75ec5c609e Merge remote-tracking branch 'upstream/master' into systemd ... Conflicts: maintainers/scripts/ec2/create-ebs-amis.py		2012-12-17 13:03:56 -05:00
..
efi-boot-stub	The efi boot stub code should only be run if it is enabled	2012-08-09 10:37:43 -04:00
generations-dir
grub	Merge remote-tracking branch 'upstream/master' into systemd	2012-12-17 13:03:56 -05:00
init-script	Treat init-script as a boot loader	2012-07-25 11:30:16 -04:00