Merge commit 'v2.6.28-rc2' into core/locking
[linux-2.6] / drivers / net / skfp / smttimer.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2