Merge branch 'linus' into tracing/hw-breakpoints
[safe/jmp/linux-2.6] / include / asm-generic / timex.h
2009-06-11 Arnd Bergmannasm-generic: add legacy I/O header files