---

yaml --- r: 164301 b: refs/heads/master c: 878f4f5 h: refs/heads/master i: 164299: 71e0536 v: v3
git-mirror · Sep 20, 2009 · cf1041c · cf1041c
1 parent 532dd34
commit cf1041c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8312136fa8b0a3ec7323bbb1a46be8c0c26e994e
+refs/heads/master: 878f4f533e5b4498215e67e0f886b0fc81417f5e
diff --git a/trunk/arch/x86/include/asm/string_32.h b/trunk/arch/x86/include/asm/string_32.h
@@ -65,7 +65,6 @@ static __always_inline void *__constant_memcpy(void *to, const void *from,
 	case 4:
 		*(int *)to = *(int *)from;
 		return to;
-
 	case 3:
 		*(short *)to = *(short *)from;
 		*((char *)to + 2) = *((char *)from + 2);

diff --git a/trunk/arch/x86/kernel/tsc.c b/trunk/arch/x86/kernel/tsc.c
@@ -670,7 +670,7 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
 	if ((val == CPUFREQ_PRECHANGE  && freq->old < freq->new) ||
 			(val == CPUFREQ_POSTCHANGE && freq->old > freq->new) ||
 			(val == CPUFREQ_RESUMECHANGE)) {
-		*lpj = 	cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq->new);
+		*lpj = cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq->new);
 
 		tsc_khz = cpufreq_scale(tsc_khz_ref, ref_freq, freq->new);
 		if (!(freq->flags & CPUFREQ_CONST_LOOPS))

diff --git a/trunk/drivers/acpi/acpica/tbfadt.c b/trunk/drivers/acpi/acpica/tbfadt.c
@@ -275,7 +275,6 @@ void acpi_tb_parse_fadt(u32 table_index)
 
 void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
 {
-
 	/*
 	 * Check if the FADT is larger than the largest table that we expect
 	 * (the ACPI 2.0/3.0 version). If so, truncate the table, and issue
-Original file line number
+Diff line change
@@ Expand Up / @@ -275,7 +275,6 @@ void acpi_tb_parse_fadt(u32 table_index) @@
     void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
     {
     	/*
     	 * Check if the FADT is larger than the largest table that we expect
     	 * (the ACPI 2.0/3.0 version). If so, truncate the table, and issue
@@ Expand Down @@