]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'irqdomain/irqdomain/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 11 Apr 2012 04:31:50 +0000 (14:31 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 11 Apr 2012 04:31:50 +0000 (14:31 +1000)
commitb86bd815306c73297d4b28aad86f8d4abbe7ad7b
tree92f171c704778ababc5d2bb3547e78c03f263b29
parent440f4c236a0d31d313b581ecd4fc3bd132677f66
parent409a6f61db9b2433e45299f476f57a4624ee605d
Merge remote-tracking branch 'irqdomain/irqdomain/next'

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig
arch/arm/common/Kconfig
drivers/gpio/gpio-pl061.c
include/linux/irq.h