projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9af2ebb
0aed043
)
Merge branch 'pm-next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman...
author
Tony Lindgren
<tony@atomide.com>
Fri, 24 Sep 2010 00:29:28 +0000
(17:29 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 24 Sep 2010 00:29:28 +0000
(17:29 -0700)
1
2
arch/arm/mach-omap2/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/plat-omap/include/plat/omap_hwmod.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/plat-omap/omap_device.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-omap2/Makefile
Simple merge
diff --cc
arch/arm/plat-omap/include/plat/omap_hwmod.h
Simple merge
diff --cc
arch/arm/plat-omap/omap_device.c
Simple merge