tree c2a25f2ce5ea7095715a62bad984ecd95fb0b717
parent 228b5b7e840f79c8751614ae2b83e97e361634ce
parent a83860c2da9303c864a53c299d17f608f9643541
author Linus Torvalds <torvalds@linux-foundation.org> 1237057341 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1237057341 -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: Mark Eins: Fix configuration.
  MIPS: Fix TIF_32BIT undefined problem when seccomp is disabled