aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/include/asm/ttable.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-09-11 20:35:13 -0700
committerDavid S. Miller <davem@davemloft.net>2009-09-11 20:35:13 -0700
commitcabc5c0f7fa1342049042d6e147db5a73773955b (patch)
tree2be09ae1777d580c7dfe05d6d5b76e57281ec447 /arch/sparc/include/asm/ttable.h
parentsparc64: Initial niagara2 perf counter support. (diff)
parentMerge git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff)
downloadlinux-dev-cabc5c0f7fa1342049042d6e147db5a73773955b.tar.xz
linux-dev-cabc5c0f7fa1342049042d6e147db5a73773955b.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: arch/sparc/Kconfig
Diffstat (limited to 'arch/sparc/include/asm/ttable.h')
0 files changed, 0 insertions, 0 deletions