summaryrefslogtreecommitdiffstats
path: root/arch/sparc/include/asm/dcr.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-29 15:44:22 -0700
committerDavid S. Miller <davem@davemloft.net>2009-03-29 15:44:22 -0700
commited223129a30de7d244ca9b59819f5532c9caf039 (patch)
tree9ea5649276c18f13356c4db1663368e071081a25 /arch/sparc/include/asm/dcr.h
parentffaba674090f287afe0c44fd8d978c64c03581a8 (diff)
parent81f1adf01224f5c0be5f90f43664f799c1f7bb2d (diff)
Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask-for-sparc
Conflicts: arch/sparc/kernel/smp_64.c
Diffstat (limited to 'arch/sparc/include/asm/dcr.h')
0 files changed, 0 insertions, 0 deletions