aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-27 15:16:38 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-27 15:16:38 -0400
commit760dcc6e1839e7ca82507698fb077d5d78b24964 (patch)
tree7b6ea512ea8cebd1573a77b9ff17c0c8a9865ddd /include
parent4897f1011aff7534b8e319404f7cd4028de7a453 (diff)
parent8d406c6de2e67b5bae3c43b62b492c4ff63afb92 (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] zcrypt: fix scheduling of hrtimer ap_poll_timer [S390] vdso: clock_gettime of CLOCK_THREAD_CPUTIME_ID with noexec=on [S390] vdso: fix per cpu area allocation [S390] hibernation: fix register corruption on machine checks [S390] hibernation: fix lowcore handling
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions