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
..
alpha	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-09-16 07:49:54 -07:00
arm	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6	2009-09-18 09:22:36 -07:00
avr32	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-09-15 09:39:44 -07:00
blackfin	Blackfin: update ftrace for latest toolchain	2009-09-16 22:10:52 -04:00
cris	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-09-15 09:39:44 -07:00
frv	frv: clean up linker script using new linker script macros.	2009-09-18 13:57:18 -07:00
h8300	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-09-16 07:49:54 -07:00
ia64	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2009-09-18 09:33:07 -07:00
m32r	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-09-15 09:39:44 -07:00
m68k	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu	2009-09-17 09:52:43 -07:00
m68knommu	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
microblaze	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-09-15 09:39:44 -07:00
mips	loongson: fix cut-and-paste mis-merge	2009-09-20 15:57:28 -07:00
mn10300	serial: kill off uart_info	2009-09-19 13:13:28 -07:00
parisc	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-09-16 07:49:54 -07:00
powerpc	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
s390	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
score	score: add TIF_NOTIFY_RESUME define in asm/thread_info.h	2009-09-17 12:05:56 +08:00
sh	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2009-09-18 09:43:09 -07:00
sparc	sparc: Clean up linker script using new linker script macros.	2009-09-18 13:57:18 -07:00
um	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-09-16 07:49:54 -07:00
x86	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2009-09-20 15:55:39 -07:00
xtensa	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
.gitignore
Kconfig	oprofile: fix oprofile regression: select RING_BUFFER_ALLOW_SWAP	2009-09-17 15:53:42 -04:00