]> www.infradead.org Git - users/willy/linux.git/commitdiff
projects / users / willy / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 030fc44 74e9671)
Merge branch 'linus' into irq/core
authorThomas Gleixner <tglx@linutronix.de>
Thu, 14 Feb 2019 21:26:50 +0000 (22:26 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 14 Feb 2019 21:26:50 +0000 (22:26 +0100)
Pick up upstream changes to avoid conflicts for pending patches.

1  2 
kernel/irq/irqdesc.c patch | diff1 | diff2 | blob | history
kernel/irq/manage.c patch | diff1 | diff2 | blob | history

diff --cc kernel/irq/irqdesc.c
Simple merge
diff --cc kernel/irq/manage.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.