projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9ba5a3 4ed4afb)
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Wed, 1 Dec 2010 21:47:08 +0000 (13:47 -0800)
committerErik Gilling <konkers@android.com>
Wed, 1 Dec 2010 21:47:14 +0000 (13:47 -0800)
Change-Id: I89b84ed867e185ad25c5955f3de946fcbc254b75

1  2 
arch/arm/mach-tegra/tegra2_clocks.c patch | diff1 | diff2 | blob | history
drivers/i2c/busses/i2c-tegra.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-tegra/tegra2_clocks.c
Simple merge
diff --cc drivers/i2c/busses/i2c-tegra.c
index 30eeb204416b84bed4468fe3d940a5ee4917bba3,b7481f496ec3709ac7c8e8e349b3742d0aad1dde..fd88ba3cd0035d4f9b440d1c82c6b6451b92a0aa
mode 100644,100755..100755
--- 1/drivers/i2c/busses/i2c-tegra.c
--- 2/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
Unnamed repository; edit this file 'description' to name the repository.