git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 885d078 021f653)
Merge tag 'tags/deps-irqchip-gic-3.17' into irqchip/core
authorJason Cooper <jason@lakedaemon.net>
Fri, 18 Jul 2014 20:56:39 +0000 (20:56 +0000)
committerJason Cooper <jason@lakedaemon.net>
Fri, 18 Jul 2014 20:56:39 +0000 (20:56 +0000)
From local branch irqchip/gic, this is topic branch that was set up to
facilitate merging other changes depending on the new GICv3 driver.

1  2 
drivers/irqchip/Kconfig patch | diff1 | diff2 | blob | history
drivers/irqchip/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/irqchip/Kconfig
Simple merge
diff --cc drivers/irqchip/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.