summaryrefslogtreecommitdiff
path: root/arch/parisc/include/asm/xor.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-04-05 10:14:15 +0400
committerLen Brown <len.brown@intel.com>2009-04-05 10:14:15 +0400
commit478c6a43fcbc6c11609f8cee7c7b57223907754f (patch)
treea7f7952099da60d33032aed6de9c0c56c9f8779e /arch/parisc/include/asm/xor.h
parent8a3f257c704e02aee9869decd069a806b45be3f1 (diff)
parent6bb597507f9839b13498781e481f5458aea33620 (diff)
downloadlinux-478c6a43fcbc6c11609f8cee7c7b57223907754f.tar.xz
Merge branch 'linus' into release
Conflicts: arch/x86/kernel/cpu/cpufreq/longhaul.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/parisc/include/asm/xor.h')
0 files changed, 0 insertions, 0 deletions