Merge branch 'master' of git://git.wolf31o2.org/projs/genkernel

author craig <craig@haquarter.de>

Sat, 26 Sep 2009 02:29:08 +0000 (04:29 +0200)

committer craig <craig@haquarter.de>

Sat, 26 Sep 2009 02:29:08 +0000 (04:29 +0200)
author craig <craig@haquarter.de>
Sat, 26 Sep 2009 02:29:08 +0000 (04:29 +0200)
committer craig <craig@haquarter.de>
Sat, 26 Sep 2009 02:29:08 +0000 (04:29 +0200)
diff --cc defaults/initrd.scripts
Simple merge
diff --cc defaults/linuxrc
Simple merge
diff --cc gen_initramfs.sh
Simple merge
diff --cc genkernel
Simple merge
diff --cc genkernel.conf
Simple merge
author	craig <craig@haquarter.de>
	Sat, 26 Sep 2009 02:29:08 +0000 (04:29 +0200)
committer	craig <craig@haquarter.de>
	Sat, 26 Sep 2009 02:29:08 +0000 (04:29 +0200)
		1	2
defaults/initrd.scripts	patch \|	diff1 \|	diff2 \|	blob \| history
defaults/linuxrc	patch \|	diff1 \|	diff2 \|	blob \| history
gen_initramfs.sh	patch \|	diff1 \|	diff2 \|	blob \| history
genkernel	patch \|	diff1 \|	diff2 \|	blob \| history
genkernel.conf	patch \|	diff1 \|	diff2 \|	blob \| history