diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-14 06:14:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-14 06:14:12 -0400 |
| commit | 397f09977ea350a20f20b415a9313cc790137742 (patch) | |
| tree | 0e44f2f3e5804bd5c0c6f644785006b7225e3c94 /Makefile | |
| parent | 6356bb0ad6525dae93c06478a098ed3848e9ab01 (diff) | |
| parent | a4b4bedce880046feeb5b206392960f395ed02ad (diff) | |
Merge tag 'amd_f15_m30' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/ras
Pull AMD F15h, model 0x30 and later enablement stuff, more specifically EDAC
support, from Borislav Petkov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 3 | 1 | VERSION = 3 |
| 2 | PATCHLEVEL = 11 | 2 | PATCHLEVEL = 11 |
| 3 | SUBLEVEL = 0 | 3 | SUBLEVEL = 0 |
| 4 | EXTRAVERSION = -rc4 | 4 | EXTRAVERSION = -rc5 |
| 5 | NAME = Linux for Workgroups | 5 | NAME = Linux for Workgroups |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |