projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5fcdb16
32b6cb3
)
ARM: Merge for-2635/gpio2
author
Ben Dooks
<ben-linux@fluff.org>
Wed, 19 May 2010 09:04:08 +0000
(18:04 +0900)
committer
Ben Dooks
<ben-linux@fluff.org>
Wed, 19 May 2010 09:04:08 +0000
(18:04 +0900)
Merge branch 'for-2635/gpio2' into for-linus/samsung2
1
2
arch/arm/mach-s3c2410/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-s3c2410/mach-bast.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-s3c2410/mach-h1940.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-s3c2410/mach-n30.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-s3c2412/mach-jive.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-s3c2412/mach-smdk2413.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-s3c2440/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-s3c2410/Kconfig
Simple merge
diff --cc
arch/arm/mach-s3c2410/mach-bast.c
Simple merge
diff --cc
arch/arm/mach-s3c2410/mach-h1940.c
Simple merge
diff --cc
arch/arm/mach-s3c2410/mach-n30.c
Simple merge
diff --cc
arch/arm/mach-s3c2412/mach-jive.c
Simple merge
diff --cc
arch/arm/mach-s3c2412/mach-smdk2413.c
Simple merge
diff --cc
arch/arm/mach-s3c2440/Kconfig
Simple merge