Merge branches 'x86/asm', 'x86/cleanups', 'x86/cpudetect', 'x86/debug', 'x86/doc', 'x86/header-fixes', 'x86/mm', 'x86/paravirt', 'x86/pat', 'x86/setup-v2', 'x86/subarch', 'x86/uaccess' and 'x86/urgent' into x86/core - linux - Linux Kernel (branches are rebased on master from time to time)

diff options

author	Ingo Molnar <mingo@elte.hu>	2009-01-28 23:13:53 +0100
committer	Ingo Molnar <mingo@elte.hu>	2009-01-28 23:13:53 +0100
commit	74b6eb6b937df07d0757e8642b7538b07da4290f (patch)
tree	9104afabf5dd41e012a911d37bd60d04a57183db /arch/x86/include/asm/setup.h
parent	6a385db5ce7f1fd2c68ec511e44587b67dab8fca (diff)
parent	2d4d57db692ea790e185656516e6ebe8791f1788 (diff)
parent	8f6d86dc4178957d9814b1784848012a927a3898 (diff)
parent	b38b0665905538e76e26f2a4c686179abb1f69f6 (diff)
parent	d5e397cb49b53381e4c99a064ca733c665646de8 (diff)
parent	e56d0cfe7790fd3218ae4f6aae1335547fea8763 (diff)
parent	dbca1df48e89d8aa59254fdc10ef16c16e73d94e (diff)
parent	fb746d0e1365b7472ccc4c3d5b0672b34a092d0b (diff)
parent	6522869c34664dd5f05a0a327e93915b1281c90d (diff)
parent	d639bab8da86d330493487e8c0fea8ca31f53427 (diff)
parent	042cbaf88ab48e11afb725541e3c2cbf5b483680 (diff)
parent	5662a2f8e7313f78d6b17ab383f3e4f04971c335 (diff)
parent	3b4b75700a245d0d48fc52a4d2f67d3155812aba (diff)
parent	30a0fb947a68ad3ab8a7184e3b3d79dce10e3688 (diff)
download	linux-74b6eb6b937df07d0757e8642b7538b07da4290f.tar.bz2

Merge branches 'x86/asm', 'x86/cleanups', 'x86/cpudetect', 'x86/debug', 'x86/doc', 'x86/header-fixes', 'x86/mm', 'x86/paravirt', 'x86/pat', 'x86/setup-v2', 'x86/subarch', 'x86/uaccess' and 'x86/urgent' into x86/core


context:
space:
mode: