]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Pull novell-bugzilla-156426 into release branch
authorLen Brown <len.brown@intel.com>
Thu, 15 Jun 2006 19:38:30 +0000 (15:38 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 15 Jun 2006 19:38:30 +0000 (15:38 -0400)
Conflicts:

arch/i386/kernel/acpi/boot.c

1  2 
arch/i386/kernel/acpi/boot.c

Simple merge