Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing (416dfdcd) · Commits · github.com / kvm-riscv / linux

Commit 416dfdcd authored Apr 24, 2009 by

Ingo Molnar

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>

parents 56449f43 09106974

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment