]> 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, 19 Jun 2013 05:55:24 +0000 (15:55 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 05:55:24 +0000 (15:55 +1000)
commitbc44f903bd109636bdcfd1b9b3c3b761a866b691
treef5f8e05de0435cc25de8fb2b7169cd53571640a1
parentc18f89fa54f73063bfafa3667314b1a4b4ef6b85
parentb7ba09c29ed36eda8e16453646b55faea7f9c25f
Merge remote-tracking branch 'irqdomain/irqdomain/next'

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