diff options
| author | Bo Yan <byan@nvidia.com> | 2012-07-09 14:11:09 -0700 |
|---|---|---|
| committer | Bo Yan <byan@nvidia.com> | 2012-07-09 14:11:09 -0700 |
| commit | 5056dc8ccaa3cbafad5ae8eaeceec2994da3cfe5 (patch) | |
| tree | c3c9f44c314ff2b190eccdff13258bf5df078cc5 /Makefile | |
| parent | f092a6eca1da1086c4b4a2a6893b53d1997dc58d (diff) | |
| parent | e69322319507d5d3f916498fe326499d4f5d46b3 (diff) | |
Merge remote branch 'origin/android-tegra-nv-3.4' into tot
Conflicts:
arch/arm/mach-imx/hotplug.c
Change-Id: I33c5f2e4c2d556c09173be3c5fd36bf59f7c9ca8
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 = 2 +SUBLEVEL = 4 EXTRAVERSION = NAME = Saber-toothed Squirrel |