diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-19 00:44:29 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-19 00:44:29 +0200 |
commit | e024f69de9bd5b2686019f2491b779044cf89707 (patch) | |
tree | ba0bd62ea40e54123911b01007895e5afc192033 /arch/cris/include/asm/pgtable.h | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
parent | msm: timer: fix missing return value (diff) | |
download | linux-e024f69de9bd5b2686019f2491b779044cf89707.tar.xz linux-e024f69de9bd5b2686019f2491b779044cf89707.zip |
Merge branch 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm
* 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
msm: timer: fix missing return value
msm: Remove extraneous ffa device check
Diffstat (limited to 'arch/cris/include/asm/pgtable.h')
0 files changed, 0 insertions, 0 deletions