projects
/
profile
/
common
/
kernel-common.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6071399
f64bea4
)
ARM: Merge for-2635/fb-updates1
author
Ben Dooks
<ben-linux@fluff.org>
Wed, 19 May 2010 09:04:11 +0000
(18:04 +0900)
committer
Ben Dooks
<ben-linux@fluff.org>
Wed, 19 May 2010 09:04:11 +0000
(18:04 +0900)
Merge branch 'for-2635/fb-updates1' into for-linus/samsung2
1
2
arch/arm/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-s3c2410/include/mach/regs-gpio.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/plat-samsung/include/plat/clock.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/plat-samsung/include/plat/cpu.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/Makefile
Simple merge
diff --cc
arch/arm/mach-s3c2410/include/mach/regs-gpio.h
Simple merge
diff --cc
arch/arm/plat-samsung/include/plat/clock.h
Simple merge
diff --cc
arch/arm/plat-samsung/include/plat/cpu.h
Simple merge