1
linux/arch/mips
Linus Torvalds dcbb5593d9 loongson: fix cut-and-paste mis-merge
Ingo points out that I screwed up when merging the 'timers-for-linus'
branch in commit a03fdb7612.

A bit too much copy-and-pasting caused the end result to have an
extraneous 'return' in the middle of an expression.  That was obviously
bogus.  Blush.

Reported-by-with-patch: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-09-20 15:57:28 -07:00
..
alchemy MIPS: Alchemy: override loops_per_jiffy detection 2009-09-17 20:07:51 +02:00
ar7 MIPS: AR7: Make board code register ar7_wdt as a platform device 2009-09-17 20:07:48 +02:00
basler/excite
bcm47xx
bcm63xx MIPS: BCM63xx: Add integrated ethernet mac support. 2009-09-17 20:07:53 +02:00
boot MIPS: Remove useless zero initializations. 2009-09-17 20:07:51 +02:00
cavium-octeon MIPS: Octeon: Move some platform device registration to its own file. 2009-09-17 20:07:52 +02:00
cobalt Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
configs MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs. 2009-09-17 20:07:52 +02:00
dec Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-09-18 09:15:24 -07:00
emma MIPS: Remove useless zero initializations. 2009-09-17 20:07:51 +02:00
fw MIPS: Remove useless zero initializations. 2009-09-17 20:07:51 +02:00
gt64120/wrppmc Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
include/asm Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-09-17 21:00:02 -07:00
jazz MIPS: Jazz: Fix read buffer overflow 2009-08-03 17:52:47 +01:00
kernel MIPS: BCM63xx: Add Broadcom 63xx CPU definitions. 2009-09-17 20:07:52 +02:00
lasat timekeeping: Increase granularity of read_persistent_clock() 2009-08-15 10:55:46 +02:00
lib MIPS: Fix __ndelay build error and add 'ull' suffix for 32-bit kernel 2009-06-17 11:06:24 +01:00
loongson loongson: fix cut-and-paste mis-merge 2009-09-20 15:57:28 -07:00
math-emu
mipssim MIPS: Remove useless zero initializations. 2009-09-17 20:07:51 +02:00
mm MIPS: BCM63xx: Add Broadcom 63xx CPU definitions. 2009-09-17 20:07:52 +02:00
mti-malta Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-09-18 09:15:24 -07:00
nxp MIPS: Remove useless zero initializations. 2009-09-17 20:07:51 +02:00
oprofile MIPS: Loongson: Add oprofile support 2009-09-17 20:07:47 +02:00
pci MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs. 2009-09-17 20:07:52 +02:00
pmc-sierra timekeeping: Increase granularity of read_persistent_clock() 2009-08-15 10:55:46 +02:00
power MIPS: Use PAGE_SIZE in assembly instead of _PAGE_SIZE. 2009-09-17 20:07:48 +02:00
rb532 MIPS: RB532: Check irq number when handling GPIO interrupts 2009-06-17 11:06:27 +01:00
sgi-ip22 MIPS: IP22, IP28: Build with -Werror 2009-09-17 20:07:44 +02:00
sgi-ip27 MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users. 2009-06-24 18:34:39 +01:00
sgi-ip32
sibyte timekeeping: Increase granularity of read_persistent_clock() 2009-08-15 10:55:46 +02:00
sni timekeeping: Increase granularity of read_persistent_clock() 2009-08-15 10:55:46 +02:00
txx9 MIPS: TXx9: Fix error handling. 2009-09-17 20:07:43 +02:00
vr41xx Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
Kconfig MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs. 2009-09-17 20:07:52 +02:00
Kconfig.debug
Makefile MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs. 2009-09-17 20:07:52 +02:00