]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'omap-cleanup-sparseirq-for-v3.7' into devel-dt
authorTony Lindgren <tony@atomide.com>
Sun, 16 Sep 2012 22:35:06 +0000 (15:35 -0700)
committerTony Lindgren <tony@atomide.com>
Sun, 16 Sep 2012 22:35:06 +0000 (15:35 -0700)
commit5ccf08a953cdc800980e57a0418f7fd58b8519f4
tree9326c7213d5ccee556bff1831e8f88681a27e57c
parentc1125e7d39636592e51e97662447189fc603b9dc
parente0529eb5f69a7103fe21b8c1a74dbf3aecb755b8
Merge tag 'omap-cleanup-sparseirq-for-v3.7' into devel-dt

This branch contains changes needed to make omap2+
work properly with sparse IRQ. It also removes
dependencies to mach/hardware.h. These help moving
things towards ARM single zImage support.

This branch is based on a commit in tty-next
branch with omap-devel-gpmc-fixed-for-v3.7 and
cleanup-omap-tags-for-v3.7 merged in to keep things
compiling and sort out some merge conflicts.

Conflicts:
arch/arm/mach-omap2/omap4-common.c
drivers/gpio/gpio-twl4030.c
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/omap4-common.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/timer.c
drivers/gpio/gpio-twl4030.c