aboutsummaryrefslogtreecommitdiff
path: root/include/asm-generic/siginfo.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-23 13:26:27 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-23 13:26:27 +0200
commit101d5b713700b902b1c200cdd1925c3cb7d34567 (patch)
treea0d4b4140129ad2f24fd17b965dfcfbbb1ac01db /include/asm-generic/siginfo.h
parentcec5eb7be3a104fffd27ca967ee8e15a123050e2 (diff)
parente6babb6b7fed93c93f8fc5ef8ebd3a474fc2df3e (diff)
Merge branch 'x86/signal' into core/signal
Conflicts: arch/x86/kernel/cpu/feature_names.c arch/x86/kernel/setup.c drivers/pci/intel-iommu.c include/asm-x86/cpufeature.h Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-generic/siginfo.h')
0 files changed, 0 insertions, 0 deletions