]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'irqdomain/irqdomain/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 05:50:17 +0000 (15:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 05:50:17 +0000 (15:50 +1000)
commit4b71b8551a320e00a066ee5bec174c4275271db8
tree052dee191653837e3885f96b4164bd4c682a3849
parent22e1276f1f904eee301446d5fe214b449c759cb9
parent798f0fd188be3656991c8745104b5ee045769a5f
Merge remote-tracking branch 'irqdomain/irqdomain/next'

Conflicts:
kernel/irq/irqdomain.c
kernel/irq/generic-chip.c
kernel/irq/irqdomain.c