Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / arch / powerpc / configs / makalu_defconfig

diff --git a/arch/powerpc/configs/makalu_defconfig b/arch/powerpc/configs/makalu_defconfig
index df65baad2b28b6e94696ec50df90f3239613389d..c5db0265e5d8a1a313889287d1aa52ac501961e7 100644 (file)
--- a/arch/powerpc/configs/makalu_defconfig
+++ b/arch/powerpc/configs/makalu_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.24-rc4
-# Fri Dec 21 07:58:43 2007
+# Linux kernel version: 2.6.24-rc6
+# Mon Dec 24 11:18:32 2007
 #
 # CONFIG_PPC64 is not set