Merge arm integrator time.h removal
commit8a6d26885bd627d0337e904147d24ab9c9ca2c98
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 19 Oct 2004 05:21:19 +0000 (18 22:21 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 19 Oct 2004 05:21:19 +0000 (18 22:21 -0700)
tree8d5941aedb1f1919c697cbadc7ce361319e0ffeb
parentd8b3edf183f88d72c4b4cccdb9ace489462b03a9
parent8c246a1304dbd6d9ed899c70e46f96ab83c43052
Merge arm integrator time.h removal
arch/arm/kernel/time.c
include/asm-arm/arch-integrator/time.h