OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3f96a2d
8cb8de5
)
Merge tag 'omap-devel-f-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
author
Tony Lindgren
<tony@atomide.com>
Thu, 5 Jul 2012 09:13:04 +0000
(
02:13
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 5 Jul 2012 09:13:04 +0000
(
02:13
-0700)
Miscellaneous OMAP clock, hwmod, clockdomain, and powerdomain patches
for 3.6. Mostly small infrastructure improvements, and preparation
for OMAP5 and AM33xx code.
Conflicts:
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/plat-omap/include/plat/omap_hwmod.h
1
2
arch/arm/mach-omap2/control.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/omap_hwmod.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/plat-omap/include/plat/omap_hwmod.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-omap2/control.h
Simple merge
diff --cc
arch/arm/mach-omap2/omap_hwmod.c
Simple merge
diff --cc
arch/arm/plat-omap/include/plat/omap_hwmod.h
Simple merge
OSDN Git Service
