diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-05-11 14:44:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 14:44:31 +0200 |
| commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
| tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /arch/x86/kernel/cpu/cpu_debug.c | |
| parent | x86 gart: reimplement IOMMU_LEAK feature by using DMA_API_DEBUG (diff) | |
| parent | Linux 2.6.30-rc5 (diff) | |
| download | wireguard-linux-41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51.tar.xz wireguard-linux-41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51.zip | |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/cpu_debug.c')
| -rw-r--r--[-rwxr-xr-x] | arch/x86/kernel/cpu/cpu_debug.c | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/cpu_debug.c b/arch/x86/kernel/cpu/cpu_debug.c index 46e29ab96c6a..46e29ab96c6a 100755..100644 --- a/arch/x86/kernel/cpu/cpu_debug.c +++ b/arch/x86/kernel/cpu/cpu_debug.c |