projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e8e9a4 ecf1cce)
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Fri, 8 Oct 2010 00:37:06 +0000 (17:37 -0700)
committerColin Cross <ccross@android.com>
Fri, 8 Oct 2010 00:37:06 +0000 (17:37 -0700)
Conflicts:
arch/arm/mach-tegra/tegra_i2s_audio.c

Change-Id: Id7a483e1377549529f85a8fea67b76a881e40f87


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.