diff options
author | 2008-07-04 10:46:46 -0700 | |
---|---|---|
committer | 2008-07-04 10:46:46 -0700 | |
commit | b8a0b6ccf2ba2519ace65d782b41ee91bf3c3778 (patch) | |
tree | 112dbdeb68f0693d4b6db7d81cc0a7a89a13a438 /drivers/ide/ide.c | |
parent | mmc: don't use DMA on newer ENE controllers (diff) | |
parent | xen: fix address truncation in pte mfn<->pfn conversion (diff) | |
download | linux-dev-b8a0b6ccf2ba2519ace65d782b41ee91bf3c3778.tar.xz linux-dev-b8a0b6ccf2ba2519ace65d782b41ee91bf3c3778.zip |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
xen: fix address truncation in pte mfn<->pfn conversion
arch/x86/mm/init_64.c: early_memtest(): fix types
x86: fix Intel Mac booting with EFI
Diffstat (limited to 'drivers/ide/ide.c')
0 files changed, 0 insertions, 0 deletions