Merge branch 'for_3.3/uart/runtime-pm' of...
Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into uart Conflicts: arch/arm/mach-omap2/pm34xx.c
Showing
- arch/arm/mach-omap2/Kconfig 8 additions, 3 deletionsarch/arm/mach-omap2/Kconfig
- arch/arm/mach-omap2/board-3430sdp.c 1 addition, 99 deletionsarch/arm/mach-omap2/board-3430sdp.c
- arch/arm/mach-omap2/board-4430sdp.c 1 addition, 67 deletionsarch/arm/mach-omap2/board-4430sdp.c
- arch/arm/mach-omap2/board-n8x0.c 3 additions, 3 deletionsarch/arm/mach-omap2/board-n8x0.c
- arch/arm/mach-omap2/board-omap4panda.c 1 addition, 67 deletionsarch/arm/mach-omap2/board-omap4panda.c
- arch/arm/mach-omap2/board-ti8168evm.c 3 additions, 8 deletionsarch/arm/mach-omap2/board-ti8168evm.c
- arch/arm/mach-omap2/clock.c 1 addition, 1 deletionarch/arm/mach-omap2/clock.c
- arch/arm/mach-omap2/clock.h 1 addition, 1 deletionarch/arm/mach-omap2/clock.h
- arch/arm/mach-omap2/clock3xxx_data.c 5 additions, 1 deletionarch/arm/mach-omap2/clock3xxx_data.c
- arch/arm/mach-omap2/common.c 37 additions, 11 deletionsarch/arm/mach-omap2/common.c
- arch/arm/mach-omap2/common.h 17 additions, 6 deletionsarch/arm/mach-omap2/common.h
- arch/arm/mach-omap2/control.h 4 additions, 4 deletionsarch/arm/mach-omap2/control.h
- arch/arm/mach-omap2/cpuidle34xx.c 0 additions, 6 deletionsarch/arm/mach-omap2/cpuidle34xx.c
- arch/arm/mach-omap2/id.c 45 additions, 7 deletionsarch/arm/mach-omap2/id.c
- arch/arm/mach-omap2/include/mach/debug-macro.S 6 additions, 6 deletionsarch/arm/mach-omap2/include/mach/debug-macro.S
- arch/arm/mach-omap2/io.c 31 additions, 7 deletionsarch/arm/mach-omap2/io.c
- arch/arm/mach-omap2/irq.c 1 addition, 1 deletionarch/arm/mach-omap2/irq.c
- arch/arm/mach-omap2/opp2xxx.h 1 addition, 1 deletionarch/arm/mach-omap2/opp2xxx.h
- arch/arm/mach-omap2/pm24xx.c 0 additions, 20 deletionsarch/arm/mach-omap2/pm24xx.c
- arch/arm/mach-omap2/pm34xx.c 0 additions, 43 deletionsarch/arm/mach-omap2/pm34xx.c
Loading
Please register or sign in to comment