diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-24 10:11:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-24 10:11:23 +0200 |
| commit | 416dfdcdb894432547ead4fcb9fa6a36b396059e (patch) | |
| tree | 8033fdda07397a59c5fa98c88927040906ce6c1a /drivers/net/bmac.c | |
| parent | tracing: make the trace clocks available generally (diff) | |
| parent | Linux 2.6.30-rc3 (diff) | |
| download | linux-416dfdcdb894432547ead4fcb9fa6a36b396059e.tar.xz linux-416dfdcdb894432547ead4fcb9fa6a36b396059e.zip | |
Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing
Conflicts:
arch/x86/kernel/ptrace.c
Merge reason: fix the conflict above, and also pick up the CONFIG_BROKEN
dependency change from upstream so that we can remove it
here.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/bmac.c')
0 files changed, 0 insertions, 0 deletions