commit | 326d8519fc97be186c55ac605c3a7c957c758ae1 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Mar 14 12:02:21 2009 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Mar 14 12:02:21 2009 -0700 |
tree | c2a25f2ce5ea7095715a62bad984ecd95fb0b717 | |
parent | 228b5b7e840f79c8751614ae2b83e97e361634ce [diff] | |
parent | a83860c2da9303c864a53c299d17f608f9643541 [diff] |
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