]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'irqdomain/irqdomain/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 02:59:09 +0000 (12:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 02:59:09 +0000 (12:59 +1000)
commitc0837be227c8c1f2332e3917d665ea2188aed5ce
tree3bb92c71ce7fca41ccb010f9ccaa8b2d09f7a87b
parent75377fdadfb06840531366759d1e62282d4544e9
parent409a6f61db9b2433e45299f476f57a4624ee605d
Merge remote-tracking branch 'irqdomain/irqdomain/next'

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig
arch/arm/common/Kconfig
drivers/gpio/gpio-pl061.c