From: H. Peter Anvin <hpa@zytor.com>
Date: Thu, 11 Feb 2010 00:55:28 +0000 (-0800)
Subject: Merge remote branch 'linus/master' into x86/bootmem
X-Git-Tag: v2.6.34-rc1~218^2~30
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=84abd88a70090cf00f9e45c3a81680874f17626e;p=linux-2.6-block.git

Merge remote branch 'linus/master' into x86/bootmem
---

84abd88a70090cf00f9e45c3a81680874f17626e