From: Linus Torvalds Date: Tue, 26 Aug 2008 17:18:24 +0000 (-0700) Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bd5a54e93c4d26509dca13d2f4f54d220558a012;p=linux-beck.git Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Ignore vmlinux.lds generated files [MIPS] kgdb: Do not call fixup_exception [MIPS] RB532: Do not define registers that are already defined [MIPS] IP27: Export symbol pcibus_to_node to modules. [MIPS] kgdb: s/(void *)0)/NULL/ [MIPS] kgdb: smp_call_function's 3rd argument is a pointer. [MIPS] TXx9: Fix mips_hpt_frequency initialization [MIPS] emma2rh: Fix build error by header file inclusion weeding. [MIPS] Jazz: Fix build error by header file inclusion weeding. [MIPS] Wire up new syscalls. [MIPS] Convert printk statements during kernel setup to use severity levels --- bd5a54e93c4d26509dca13d2f4f54d220558a012