summaryrefslogtreecommitdiff
path: root/fs/jfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-22 08:43:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-22 08:43:59 -0700
commitc81eddb0e3728661d1585fbc564449c94165cc36 (patch)
treebd7dbc09bec4c1c90552718d48fb7f30b94e0265 /fs/jfs
parenta28ca3f3244dfe05d16c67f2c0636ce6bf2b4e0a (diff)
parent76ef964c78797f9baed7c2f9a58f696e86d8a048 (diff)
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] zcore: Fix reipl device detection [S390] vdso: use ntp adjusted clock multiplier [S390] cio: use exception-save stsch [S390] add hook to reenable mss after hibernation [S390] cio: allow enable_facility from outside init functions [S390] dasd: fix endless loop in erp
Diffstat (limited to 'fs/jfs')
0 files changed, 0 insertions, 0 deletions