]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
projects / users / willy / pagecache.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 939ef66 0a4377d)
Merge branch 'irq/for-x86' into irq/core
authorThomas Gleixner <tglx@linutronix.de>
Tue, 19 May 2015 13:41:30 +0000 (15:41 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 19 May 2015 13:41:30 +0000 (15:41 +0200)
Pull in the branch which can be consumed by x86 to build their changes
on top.

1  2 
include/linux/irq.h patch | diff1 | diff2 | blob | history
kernel/irq/chip.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/irq.h
Simple merge
diff --cc kernel/irq/chip.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.