Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
commita3470171d69d5526a01c31f1ce4a1e8090b6e5d9
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 2 Oct 2007 03:15:45 +0000 (1 20:15 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 2 Oct 2007 03:15:45 +0000 (1 20:15 -0700)
treea4a69bb1bcf84ca90749e835c50e38f3de1e7fd2
parentcf8dc57cbac0fe089308f57c333ab763c36782ff
parent6f6b3940ed326eed58074d777ab92fda3a60a382
Merge branch 'upstream' of git://ftp.linux-mips.org/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