diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 14:00:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 14:00:45 +0200 |
| commit | 59c37bf8924c30fbac7ebb66a1d92dcb9f05f6b1 (patch) | |
| tree | 2ffc3f2ce655806424d022f3a4daec7665ab888f /drivers/media/dvb/siano/sms-cards.h | |
| parent | ec70cae8698632917f06110fdb70c6364281ecc6 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | blackbird-op-linux-59c37bf8924c30fbac7ebb66a1d92dcb9f05f6b1.tar.gz blackbird-op-linux-59c37bf8924c30fbac7ebb66a1d92dcb9f05f6b1.zip | |
Merge commit 'v2.6.27-rc6' into x86/unify-cpu-detect
Conflicts:
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/common_64.c
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/dvb/siano/sms-cards.h')
| -rw-r--r-- | drivers/media/dvb/siano/sms-cards.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/siano/sms-cards.h b/drivers/media/dvb/siano/sms-cards.h index 83b39bc203fe..c8f3da6f9bc1 100644 --- a/drivers/media/dvb/siano/sms-cards.h +++ b/drivers/media/dvb/siano/sms-cards.h @@ -4,7 +4,7 @@ * Copyright (c) 2008 Michael Krufky <mkrufky@linuxtv.org> * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as + * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation; * * Software distributed under the License is distributed on an "AS IS" |
