tree a4a69bb1bcf84ca90749e835c50e38f3de1e7fd2
parent cf8dc57cbac0fe089308f57c333ab763c36782ff
parent 6f6b3940ed326eed58074d777ab92fda3a60a382
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1191294945 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1191294945 -0700

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