diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-07-18 17:50:45 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-07-18 17:50:45 +0530 |
| commit | fac3a3330e9d5f67f55a11629217220a18133bd5 (patch) | |
| tree | a38a68fa3e58febc03cadd4eea37b3b2ffcbe334 /Makefile | |
| parent | 84b91a0abe3485cbdb09debaf1ccaaa2c6a7d1fa (diff) | |
| parent | 763c71b1319c56272e42cf6ada6994131f0193a7 (diff) | |
Merge commit 'v3.4.5' into android-t114-3.4-rebased
Linux v3.4.5
Conflicts:
drivers/base/power/main.c
Change-Id: I782e650a89665caea8aed9e5598234888dc11088
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
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 = 4 +SUBLEVEL = 5 EXTRAVERSION = NAME = Saber-toothed Squirrel |