From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 8 Mar 2007 03:04:21 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=06aa5b4aae223ea4d623dc68e85466174bb92c84;p=deliverable%2Flinux.git

Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] ARC: Fix several compiler warnings.
  [MIPS] ISA: Fix typo
  [CHAR] ds1286: Fix handling of seconds in RTC_ALM_SET ioctl.
---

06aa5b4aae223ea4d623dc68e85466174bb92c84