summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-11 04:12:51 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-11 04:12:51 +0200
commiteee33abe592da1763550e6e55b1cfb7fdc6a9b4c (patch)
tree6946db63c346f3aa215546aed47080c1d1b1087a /fs
parentMerge branch 'for-linus' of git://git.open-osd.org/linux-open-osd (diff)
parent[S390] define KTIME_SCALAR for 32-bit s390 (diff)
downloadlinux-eee33abe592da1763550e6e55b1cfb7fdc6a9b4c.tar.xz
linux-eee33abe592da1763550e6e55b1cfb7fdc6a9b4c.zip
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] define KTIME_SCALAR for 32-bit s390 [S390] add generic atomic64 support for 31 bit [S390] improve suspend/resume error messages [S390] set SCHED_OMIT_FRAME_POINTER for s390 [S390] add __ucmpdi2() helper function [S390] perf_counter build fix [S390] shutdown actions: save/return rc from init function [S390] dasd: correct debugfeature sense dump [S390] udelay: disable lockdep to avoid false positives [S390] monreader: fix dev_set_drvdata conversion [S390] sclp: fix compile error for !SCLP_CONSOLE
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions