| commit | 90f95768447e040af96d3bfdaf5c64b407ae3dca | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 05 12:13:52 2014 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 05 12:13:52 2014 -0800 |
| tree | 8d6cdeade953a6630d33cdc97988e6d04e3b0bda | |
| parent | a1cff6e25e6e3b55183610dddca91546951b20e3 [diff] | |
| parent | 6ed15ea67b5ebb13ececcfc6056d90a70ed96f7b [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux Pull s390 update from Martin Schwidefsky: "One small improvement for the cputime accounting, two bug fixes and an update for the default configuration files" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/ftrace: add ftrace_graph_is_dead() check s390: update default configuration s390/vdso: fix stack corruption s390/time: use stck clock fast for do_account_vtime