Merge branch 'linus' into stackprotector
[safe/jmp/linux-2.6] / arch / x86 / include / asm / iomap.h
2008-11-09 Arjan van de Venx86: move iomap.h to the new include location