Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and...
Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and 'devel-hsmmc' into omap-for-linus Conflicts: arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Showing
- arch/arm/mach-omap1/mcbsp.c 259 additions, 68 deletionsarch/arm/mach-omap1/mcbsp.c
- arch/arm/mach-omap2/board-2430sdp.c 4 additions, 3 deletionsarch/arm/mach-omap2/board-2430sdp.c
- arch/arm/mach-omap2/board-3430sdp.c 7 additions, 9 deletionsarch/arm/mach-omap2/board-3430sdp.c
- arch/arm/mach-omap2/board-3630sdp.c 2 additions, 2 deletionsarch/arm/mach-omap2/board-3630sdp.c
- arch/arm/mach-omap2/board-4430sdp.c 10 additions, 9 deletionsarch/arm/mach-omap2/board-4430sdp.c
- arch/arm/mach-omap2/board-am3517crane.c 3 additions, 3 deletionsarch/arm/mach-omap2/board-am3517crane.c
- arch/arm/mach-omap2/board-am3517evm.c 5 additions, 5 deletionsarch/arm/mach-omap2/board-am3517evm.c
- arch/arm/mach-omap2/board-apollon.c 2 additions, 2 deletionsarch/arm/mach-omap2/board-apollon.c
- arch/arm/mach-omap2/board-cm-t35.c 5 additions, 6 deletionsarch/arm/mach-omap2/board-cm-t35.c
- arch/arm/mach-omap2/board-cm-t3517.c 2 additions, 3 deletionsarch/arm/mach-omap2/board-cm-t3517.c
- arch/arm/mach-omap2/board-devkit8000.c 2 additions, 4 deletionsarch/arm/mach-omap2/board-devkit8000.c
- arch/arm/mach-omap2/board-flash.c 1 addition, 1 deletionarch/arm/mach-omap2/board-flash.c
- arch/arm/mach-omap2/board-generic.c 2 additions, 2 deletionsarch/arm/mach-omap2/board-generic.c
- arch/arm/mach-omap2/board-h4.c 3 additions, 2 deletionsarch/arm/mach-omap2/board-h4.c
- arch/arm/mach-omap2/board-igep0020.c 4 additions, 6 deletionsarch/arm/mach-omap2/board-igep0020.c
- arch/arm/mach-omap2/board-igep0030.c 3 additions, 3 deletionsarch/arm/mach-omap2/board-igep0030.c
- arch/arm/mach-omap2/board-ldp.c 23 additions, 2 deletionsarch/arm/mach-omap2/board-ldp.c
- arch/arm/mach-omap2/board-n8x0.c 1 addition, 1 deletionarch/arm/mach-omap2/board-n8x0.c
- arch/arm/mach-omap2/board-omap3beagle.c 1 addition, 3 deletionsarch/arm/mach-omap2/board-omap3beagle.c
- arch/arm/mach-omap2/board-omap3evm.c 5 additions, 6 deletionsarch/arm/mach-omap2/board-omap3evm.c
Loading
Please register or sign in to comment