From: Ingo Molnar Date: Sun, 5 Apr 2009 23:41:22 +0000 (+0200) Subject: Merge branch 'linus' into irq/threaded X-Git-Tag: v2.6.30-rc1~3^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95;p=pandora-kernel.git Merge branch 'linus' into irq/threaded Conflicts: include/linux/irq.h kernel/irq/handle.c --- 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 Reading git-diff-tree failed