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:
2910f14
de6ca33
)
Merge tag 'cleanup-fixes-for-v3.7' into test_v3.6-rc6_ocb3.7_cff3.7_odaf3.7
author
Paul Walmsley
<paul@pwsan.com>
Sun, 23 Sep 2012 23:15:44 +0000
(17:15 -0600)
committer
Paul Walmsley
<paul@pwsan.com>
Sun, 23 Sep 2012 23:15:44 +0000
(17:15 -0600)
These fixes are needed to fix non-omap build breakage for
twl-core driver and to fix omap1_defconfig compile when
led driver changes and omap sparse IRQ changes are merged
together. Also fix warnings for omaps not using pinctrl
framework yet.
32 files changed:
1
2
arch/arm/mach-omap1/board-htcherald.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap1/clock_data.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap1/dma.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap1/leds-h2p2-debug.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/board-n8x0.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/board-overo.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/board-zoom-debugboard.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/clkt_dpll.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/clock.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/clock33xx_data.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/clock3xxx.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/common-board-devices.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/dpll3xxx.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/gpio.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/gpmc.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/id.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/irq.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/omap-wakeupgen.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/omap_hwmod.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/pm34xx.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/powerdomain.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/prcm.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/serial.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/timer.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/vc.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/plat-omap/dma.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/plat-omap/sram.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/tty/serial/imx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/gadget/u_serial.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/serial/ftdi_sio.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-omap1/board-htcherald.c
Simple merge
diff --cc
arch/arm/mach-omap1/clock_data.c
Simple merge
diff --cc
arch/arm/mach-omap1/dma.c
Simple merge
diff --cc
arch/arm/mach-omap1/leds-h2p2-debug.c
Simple merge
diff --cc
arch/arm/mach-omap2/board-n8x0.c
Simple merge
diff --cc
arch/arm/mach-omap2/board-overo.c
Simple merge
diff --cc
arch/arm/mach-omap2/board-zoom-debugboard.c
Simple merge
diff --cc
arch/arm/mach-omap2/clkt_dpll.c
Simple merge
diff --cc
arch/arm/mach-omap2/clock.c
Simple merge
diff --cc
arch/arm/mach-omap2/clock33xx_data.c
Simple merge
diff --cc
arch/arm/mach-omap2/clock3xxx.c
Simple merge
diff --cc
arch/arm/mach-omap2/common-board-devices.c
Simple merge
diff --cc
arch/arm/mach-omap2/dpll3xxx.c
Simple merge
diff --cc
arch/arm/mach-omap2/gpio.c
Simple merge
diff --cc
arch/arm/mach-omap2/gpmc.c
Simple merge
diff --cc
arch/arm/mach-omap2/id.c
Simple merge
diff --cc
arch/arm/mach-omap2/irq.c
Simple merge
diff --cc
arch/arm/mach-omap2/omap-wakeupgen.c
Simple merge
diff --cc
arch/arm/mach-omap2/omap_hwmod.c
Simple merge
diff --cc
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Simple merge
diff --cc
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Simple merge
diff --cc
arch/arm/mach-omap2/pm34xx.c
Simple merge
diff --cc
arch/arm/mach-omap2/powerdomain.c
Simple merge
diff --cc
arch/arm/mach-omap2/prcm.c
Simple merge
diff --cc
arch/arm/mach-omap2/serial.c
Simple merge
diff --cc
arch/arm/mach-omap2/timer.c
Simple merge
diff --cc
arch/arm/mach-omap2/vc.c
Simple merge
diff --cc
arch/arm/plat-omap/dma.c
Simple merge
diff --cc
arch/arm/plat-omap/sram.c
Simple merge
diff --cc
drivers/tty/serial/imx.c
Simple merge
diff --cc
drivers/usb/gadget/u_serial.c
Simple merge
diff --cc
drivers/usb/serial/ftdi_sio.c
Simple merge