aboutsummaryrefslogtreecommitdiff
path: root/include/asm-cris/fasttimer.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-01-29 22:45:39 +1100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-01-29 22:45:39 +1100
commit03bc26cfefd6db756e6bc7fcda11dc17ada7be16 (patch)
tree36b4cdbd02e464a016d78e4b520595922d803e68 /include/asm-cris/fasttimer.h
parent8cd226ca3f64f28c8123ebfaa6afe8dc8c18b174 (diff)
parent6494a93d55fad586238cc1940e846c6d03e1aaf6 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: Module: check to see if we have a built in module with the same name module: add module taint on ndiswrapper module: fix the module name length in param_sysfs_builtin module: make module_address_lookup safe module: better OOPS and lockdep coverage for loading modules module: Fix gratuitous sprintf in module.c module: wait for dependent modules doing init. module: Don't report discarded init pages as kernel text.
Diffstat (limited to 'include/asm-cris/fasttimer.h')
0 files changed, 0 insertions, 0 deletions