]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'irqdomain/irqdomain/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 3 Apr 2012 02:17:07 +0000 (12:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 3 Apr 2012 02:17:07 +0000 (12:17 +1000)
commit6d2d0d17bfc7a9823dd700d84587234e9d15bcba
treedba05f7e53b2707dcd3c47e0dd28135a82691659
parent744600a35f1fd4eca1d8c83931b1813394b54159
parent409a6f61db9b2433e45299f476f57a4624ee605d
Merge remote-tracking branch 'irqdomain/irqdomain/next'

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