projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c9d501e
46bf4a5
)
Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock
author
Tony Lindgren
<tony@atomide.com>
Tue, 13 Nov 2012 21:25:38 +0000
(13:25 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 13 Nov 2012 21:25:38 +0000
(13:25 -0800)
15 files changed:
1
2
arch/arm/mach-omap2/board-omap3beagle.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/clock33xx_data.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/clock3xxx_data.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/clock44xx_data.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/control.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/omap_opp_data.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/omap_twl.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/pm.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/pm34xx.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/serial.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/sr_device.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/voltagedomains44xx_data.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/tidspbridge/include/dspbridge/host_os.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/musb/musb_dsps.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-omap2/board-omap3beagle.c
Simple merge
diff --cc
arch/arm/mach-omap2/clock33xx_data.c
Simple merge
diff --cc
arch/arm/mach-omap2/clock3xxx_data.c
Simple merge
diff --cc
arch/arm/mach-omap2/clock44xx_data.c
Simple merge
diff --cc
arch/arm/mach-omap2/control.h
Simple merge
diff --cc
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Simple merge
diff --cc
arch/arm/mach-omap2/omap_opp_data.h
Simple merge
diff --cc
arch/arm/mach-omap2/omap_twl.c
Simple merge
diff --cc
arch/arm/mach-omap2/pm.c
Simple merge
diff --cc
arch/arm/mach-omap2/pm34xx.c
Simple merge
diff --cc
arch/arm/mach-omap2/serial.c
Simple merge
diff --cc
arch/arm/mach-omap2/sr_device.c
Simple merge
diff --cc
arch/arm/mach-omap2/voltagedomains44xx_data.c
index
c3115f6
,
b893c8e
..
48b22a0
---
1
/
arch/arm/mach-omap2/voltagedomains44xx_data.c
---
2
/
arch/arm/mach-omap2/voltagedomains44xx_data.c
+++ b/
arch/arm/mach-omap2/voltagedomains44xx_data.c
@@@
-22,7
-22,7
+22,7
@@@
#include <linux/init.h>
#include "common.h"
--
++#include "soc.h"
#include "prm-regbits-44xx.h"
#include "prm44xx.h"
#include "prcm44xx.h"
diff --cc
drivers/staging/tidspbridge/include/dspbridge/host_os.h
Simple merge
diff --cc
drivers/usb/musb/musb_dsps.c
Simple merge