projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e55f37d 8086994)
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorDima Zavin <dima@android.com>
Thu, 11 Nov 2010 23:35:21 +0000 (15:35 -0800)
committerDima Zavin <dima@android.com>
Thu, 11 Nov 2010 23:35:21 +0000 (15:35 -0800)
Conflicts:
arch/arm/common/fiq_debugger.c

Change-Id: If8de163f3e1e41b35f87a5c8e9370f1cc28ed358


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