projects
/
GitHub
/
LineageOS
/
G12
/
android_kernel_amlogic_linux-4.9.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
162350e
5e7184a
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...
author
Pierre Ossman
<drzeus@drzeus.cx>
Sun, 12 Oct 2008 09:08:46 +0000
(11:08 +0200)
committer
Pierre Ossman
<drzeus@drzeus.cx>
Sun, 12 Oct 2008 09:08:46 +0000
(11:08 +0200)
Conflicts:
drivers/mmc/host/atmel-mci.c
1
2
drivers/mmc/host/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/mmc/host/Kconfig
Simple merge