From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 2 Oct 2007 03:15:45 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.23-rc9~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3470171d69d5526a01c31f1ce4a1e8090b6e5d9;p=linux-2.6

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] vmlinux.lds.S: Handle note sections
  [MIPS] Fix value of O_TRUNC
---

a3470171d69d5526a01c31f1ce4a1e8090b6e5d9