diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-16 09:12:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-16 09:12:42 +0100 |
| commit | 7243f2145a9b06e5cf9a49fc9b8b9a4fff6fb42e (patch) | |
| tree | 50b73e168e0e8b711d5e1ca8878389464d6c905c /fs | |
| parent | kallsyms, tracing: output more proper symbol name (diff) | |
| parent | Merge branch 'x86/asm' into tracing/syscalls (diff) | |
| parent | parisc: sba_iommu: fix build bug when CONFIG_PARISC_AGP=y (diff) | |
| download | linux-7243f2145a9b06e5cf9a49fc9b8b9a4fff6fb42e.tar.xz linux-7243f2145a9b06e5cf9a49fc9b8b9a4fff6fb42e.zip | |
Merge branches 'tracing/ftrace', 'tracing/syscalls' and 'linus' into tracing/core
Conflicts:
arch/parisc/kernel/irq.c