Merge branch 'merge-fixes' into devel
[safe/jmp/linux-2.6] / include / asm-arm / arch-iop13xx / timex.h
2006-12-07 Dan Williams[ARM] 3995/1: iop13xx: add iop13xx support