From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 10 Jan 2009 11:04:41 +0000 (+0100)
Subject: Merge branch 'linus' into x86/setup-lzma
X-Git-Tag: v2.6.30-rc1~625^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b17304245f0db0ac69b795c411407808f3f2796d;p=pandora-kernel.git

Merge branch 'linus' into x86/setup-lzma

Conflicts:
	init/do_mounts_rd.c
---

b17304245f0db0ac69b795c411407808f3f2796d
Reading git-diff-tree failed