Removed conflict with initramfs-tools on alpha.

svn path=/dists/trunk/linux-2.6/; revision=5022

debian/arch/alpha/defines

@@ -1,7 +1,6 @@
 [base]
 flavours: alpha-generic alpha-smp
 suggests: aboot, fdutils
-conflicts: initramfs-tools
 
 kernel-arch: alpha
 kernel-header-dirs: alpha

debian/changelog

@@ -7,7 +7,11 @@ linux-2.6 (2.6.14+2.6.15-rc5-0experimental.2) UNRELEASED; urgency=low
   * Drop modular-ide.patch, nacked by ide upstream.  Prevents udev to load
     ide-generic and those successfull boots with initramfs-tools.
 
- -- maximilian attems <max@sputnik.stro.at>  Mon, 12 Dec 2005 13:00:49 +0100
+  [ Norbert Tretkowski ]
+  * [alpha] Removed conflict with initramfs-tools, thanks vorlon for finding
+    the klibc bug!
+
+ -- Norbert Tretkowski <nobse@debian.org>  Fri, 16 Dec 2005 22:09:40 +0100
 
 linux-2.6 (2.6.14+2.6.15-rc5-0experimental.1) experimental; urgency=low