ARM: OMAP: Turn on hrtimer sys_nanosleep again
authorTony Lindgren <tony@atomide.com>
Sat, 25 Feb 2006 00:45:27 +0000 (16:45 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 25 Feb 2006 00:45:27 +0000 (16:45 -0800)
The next patch will fix dyntick problem properly.

kernel/hrtimer.c
kernel/timer.c

Simple merge
diff --cc kernel/timer.c
Simple merge