projects
/
GitHub
/
LineageOS
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
591d07b
6ba54ab
)
Merge branch 'omap/headers4' into next/dt
author
Arnd Bergmann
<arnd@arndb.de>
Thu, 15 Nov 2012 16:09:41 +0000
(17:09 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Thu, 15 Nov 2012 16:09:41 +0000
(17:09 +0100)
These changes are needed for the following omap DT changes
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1
2
arch/arm/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
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/pm34xx.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/serial.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/Kconfig
Simple merge
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/pm34xx.c
Simple merge
diff --cc
arch/arm/mach-omap2/serial.c
Simple merge
diff --cc
drivers/staging/tidspbridge/include/dspbridge/host_os.h
Simple merge
diff --cc
drivers/usb/musb/musb_dsps.c
Simple merge