diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 00:31:48 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 00:31:48 +0200 |
| commit | 655bdb0e07384d04d1ecfd709c7aee6cc8bd8793 (patch) | |
| tree | 069dc6332c2987dd7a357c069b6316404147d01e /arch/um/kernel/mem.c | |
| parent | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (diff) | |
| parent | watchdog: Fix rio watchdog probe function (diff) | |
| download | linux-655bdb0e07384d04d1ecfd709c7aee6cc8bd8793.tar.xz linux-655bdb0e07384d04d1ecfd709c7aee6cc8bd8793.zip | |
Merge git://git.kernel.org/pub/scm/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.
Diffstat (limited to 'arch/um/kernel/mem.c')
0 files changed, 0 insertions, 0 deletions