From: Linus Torvalds Date: Wed, 14 Oct 2009 22:31:48 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=655bdb0e07384d04d1ecfd709c7aee6cc8bd8793;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge git://git./linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: watchdog: Fix rio watchdog probe function sparc64: Set IRQF_DISABLED on LDC channel IRQs. sparc64: Fix D-cache flushing on swapin from SW devices. sparc64: Fix niagara2 perf IRQ bits. --- 655bdb0e07384d04d1ecfd709c7aee6cc8bd8793