diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-11 08:21:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-11 08:21:29 -0800 |
| commit | 93431dd7afa908292753acccb68785efaa366f5b (patch) | |
| tree | 42a64d0150e289f936afe12da91f601625e6b8b1 /arch/x86/kernel/ftrace.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
| parent | [S390] Update default configuration. (diff) | |
| download | linux-dev-93431dd7afa908292753acccb68785efaa366f5b.tar.xz linux-dev-93431dd7afa908292753acccb68785efaa366f5b.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] Update default configuration.
[S390] dasd: fix race in dasd timer handling
[S390] dasd: bus_id -> dev_name() conversion.
[S390] Fix init irq proc build break.
[S390] vdso: fix per cpu vdso pointer in lowcore
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
0 files changed, 0 insertions, 0 deletions