tree 886e75fdfd09690cd262ca69cb7f5d1d42b48602
parent b2aaf8f74cdc84a9182f6cabf198b7763bcb9d40
parent 6a94cb73064c952255336cc57731904174b2c58f
author Ingo Molnar <mingo@elte.hu> 1230708717 +0100
committer Ingo Molnar <mingo@elte.hu> 1230708717 +0100

Merge branch 'linus' into stackprotector

Conflicts:
	arch/x86/include/asm/pda.h
	kernel/fork.c