Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
[safe/jmp/linux-2.6] / include / asm-x86 / olpc.h
2008-04-29 Andres Salomonx86: olpc: add One Laptop Per Child architecture support