From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Dec 2008 05:39:21 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.28-rc8~61
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=56d18e9932ebf4e8eca42d2ce509450e6c9c1666;p=linux-2.6-omap-h63xx.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: Return ENOSYS from sys32_syscall on 64bit kernels like elsewhere.
  MIPS: 64-bit: vmsplice needs to use the compat wrapper for o32 and N32.
  MIPS: o32: Fix number of arguments to splice(2).
  MIPS: Malta: Consolidate platform device code.
  MIPS: IP22, Fulong, Malta: Update defconfigs.
  MIPS: Malta: Add back RTC support
  MIPS: Fix potential DOS by untrusted user app.
---

56d18e9932ebf4e8eca42d2ce509450e6c9c1666