diff options
| author | Xavier Boudet <x-boudet@ti.com> | 2012-10-04 10:58:18 +0200 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2012-10-04 10:58:18 +0200 |
| commit | f91ad1217aebdf4cc7b536180ed3528952b47c8d (patch) | |
| tree | 3882b4d8a4d68aeac87f4f676e08ff3e1d5b985f /Makefile | |
| parent | 827efacf9b499b55bebef8112a18333ad0a6ed91 (diff) | |
| parent | 1c7eb28096b50831697a9cf6f8bf1af0e5b234bc (diff) | |
Merge branch 'linux-3.4.y' into tilt-3.4_04Oct_rebase
Conflicts:
drivers/rtc/rtc-twl.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 11 +SUBLEVEL = 12 EXTRAVERSION = NAME = Saber-toothed Squirrel |