summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-14 12:02:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-14 12:02:21 -0700
commit326d8519fc97be186c55ac605c3a7c957c758ae1 (patch)
treec2a25f2ce5ea7095715a62bad984ecd95fb0b717 /fs
parent228b5b7e840f79c8751614ae2b83e97e361634ce (diff)
parenta83860c2da9303c864a53c299d17f608f9643541 (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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions