summaryrefslogtreecommitdiffstats
path: root/arch/cris/include/asm/pgtable.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-19 00:44:29 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-19 00:44:29 +0200
commite024f69de9bd5b2686019f2491b779044cf89707 (patch)
treeba0bd62ea40e54123911b01007895e5afc192033 /arch/cris/include/asm/pgtable.h
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff)
parentmsm: timer: fix missing return value (diff)
downloadlinux-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