summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-06 14:53:01 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-06 14:53:01 +0200
commit046fd53773cd87125f799b00422e487bf1428d38 (patch)
treef379644e8ef8a1ce3ac09802794bd19c854265a6
parent70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff)
parent4ab4ba32aa16b012cb0faabf1a27952508fe67f2 (diff)
parentfe47784ba5cbb6b713c013e046859946789b45e4 (diff)
parent8d7ccaa545490cdffdfaff0842436a8dd85cf47b (diff)
downloadblackbird-op-linux-046fd53773cd87125f799b00422e487bf1428d38.tar.gz
blackbird-op-linux-046fd53773cd87125f799b00422e487bf1428d38.zip
Merge branches 'x86/tracehook', 'x86/xsave' and 'x86/prototypes' into x86/signal
Conflicts: arch/x86/kernel/signal_64.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
OpenPOWER on IntegriCloud