projects
/
deliverable
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
aacf094
2f31b51
)
Merge branch 'tk_prm_chain_handler_devel_3.3' of git://git.pwsan.com/linux-2.6 into...
author
Tony Lindgren
<tony@atomide.com>
Fri, 16 Dec 2011 22:00:23 +0000
(14:00 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 16 Dec 2011 22:00:23 +0000
(14:00 -0800)
Conflicts:
arch/arm/mach-omap2/Makefile
1
2
arch/arm/mach-omap2/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/omap_hwmod.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/pm34xx.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/prm2xxx_3xxx.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/prm44xx.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/Makefile
Simple merge
diff --cc
arch/arm/mach-omap2/omap_hwmod.c
index f673f808725f730a8ad1e27eff9e1e4abc43eea8,7ea3df517d2b53f36263df2e747daf4e8f19fa1d..ee9416bcc3e6072c1777ea9397ffb5578832827b
---
1
/
arch/arm/mach-omap2/omap_hwmod.c
---
2
/
arch/arm/mach-omap2/omap_hwmod.c
+++ b/
arch/arm/mach-omap2/omap_hwmod.c
@@@
-136,8
-136,9
+136,9
@@@
#include <linux/list.h>
#include <linux/mutex.h>
#include <linux/spinlock.h>
+ #include <linux/slab.h>
-#include
<plat/common.h>
+#include
"common.h"
#include <plat/cpu.h>
#include "clockdomain.h"
#include "powerdomain.h"
diff --cc
arch/arm/mach-omap2/pm34xx.c
Simple merge
diff --cc
arch/arm/mach-omap2/prm2xxx_3xxx.c
Simple merge
diff --cc
arch/arm/mach-omap2/prm44xx.c
Simple merge
diff --cc
arch/arm/plat-omap/include/plat/omap_hwmod.h
Simple merge
This page took
0.031317 seconds
and
5
git commands to generate.