aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm/r4k-timer.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-22 10:37:42 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-22 10:37:42 -0400
commitafc2788736d168fdad71d5ba24ba278b959e3178 (patch)
treef3775ed839e77e7068482609a69705e3c85a523f /arch/mips/include/asm/r4k-timer.h
parent1e787d139f89eb5f7080035625649ce4ce290037 (diff)
parentd2f82c2f70d56ba4623de25edb383fec01f43b89 (diff)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: MIPS: IP32: Remove unnecessary if not even harmful volatile keywords. MIPS: IP32: Fix build error due to uninitialized variable. MIPS: Fix sparse warning in incompatiable argument type of clear_user.
Diffstat (limited to 'arch/mips/include/asm/r4k-timer.h')
0 files changed, 0 insertions, 0 deletions