diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-02-25 03:40:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-25 03:40:26 -0500 |
| commit | 996de8c6fe95c5a9fc524241cc8f142ef0605d3d (patch) | |
| tree | 0f637ab0d80d6d7e213707ac2d8c1cc16b69523c /Makefile | |
| parent | 017c426138122c8e9b9f5057fbd0567c37b35247 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge commit 'v2.6.33' into core/rcu
Merge reason: Update from -rc4 to -final.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 33 | 3 | SUBLEVEL = 33 |
| 4 | EXTRAVERSION = -rc4 | 4 | EXTRAVERSION = |
| 5 | NAME = Man-Eating Seals of Antiquity | 5 | NAME = Man-Eating Seals of Antiquity |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
| @@ -18,10 +18,9 @@ MAKEFLAGS += -rR --no-print-directory | |||
| 18 | 18 | ||
| 19 | # Avoid funny character set dependencies | 19 | # Avoid funny character set dependencies |
| 20 | unexport LC_ALL | 20 | unexport LC_ALL |
| 21 | LC_CTYPE=C | ||
| 22 | LC_COLLATE=C | 21 | LC_COLLATE=C |
| 23 | LC_NUMERIC=C | 22 | LC_NUMERIC=C |
| 24 | export LC_CTYPE LC_COLLATE LC_NUMERIC | 23 | export LC_COLLATE LC_NUMERIC |
| 25 | 24 | ||
| 26 | # We are using a recursive build, so we need to do a little thinking | 25 | # We are using a recursive build, so we need to do a little thinking |
| 27 | # to get the ordering right. | 26 | # to get the ordering right. |