Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Mar 2009 19:02:21 +0000 (12:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Mar 2009 19:02:21 +0000 (12:02 -0700)
commit326d8519fc97be186c55ac605c3a7c957c758ae1
treec2a25f2ce5ea7095715a62bad984ecd95fb0b717
parent228b5b7e840f79c8751614ae2b83e97e361634ce
parenta83860c2da9303c864a53c299d17f608f9643541
Merge branch 'upstream' of git://ftp.linux-mips.org/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