]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51327ad 6d83f94)
Merge branch 'irq/urgent' into irq/core
authorThomas Gleixner <tglx@linutronix.de>
Sat, 19 Feb 2011 11:56:36 +0000 (12:56 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 19 Feb 2011 11:56:43 +0000 (12:56 +0100)
Reason: Further patches are conflicting with mainline fixes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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.