diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2009-09-03 16:34:23 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-09-03 16:34:23 +0200 |
| commit | 03362a05c55122baff3556109c922285299dfec4 (patch) | |
| tree | 85f83fbf4e1e8027eca05fbd8285041053a713c4 /arch/x86/include/asm/rtc.h | |
| parent | 85da07c409daba3d067824f0051d58f70cb571a0 (diff) | |
| parent | 4751a95134e05f1172131d2001c6991d671fa58c (diff) | |
Merge branch 'amd-iommu/passthrough' into amd-iommu/2.6.32
Conflicts:
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/amd_iommu_init.c
Diffstat (limited to 'arch/x86/include/asm/rtc.h')
0 files changed, 0 insertions, 0 deletions