projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ec28871
c07aee9
)
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
author
Colin Cross
<ccross@android.com>
Sat, 8 Jan 2011 22:48:26 +0000
(14:48 -0800)
committer
Colin Cross
<ccross@android.com>
Sat, 8 Jan 2011 22:48:26 +0000
(14:48 -0800)
Conflicts:
drivers/misc/Kconfig
drivers/misc/Makefile
Change-Id: Ic136562830dcd821eaae66f4c1fc66b4e0b825bd
Trivial merge
projects / firefly-linux-kernel-4.4.55.git / commitdiff