From: Vegard Nossum <vegard.nossum@gmail.com>
Date: Mon, 15 Jun 2009 13:50:49 +0000 (+0200)
Subject: Merge commit 'linus/master' into HEAD
X-Git-Tag: v3.12-rc1~14291^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=722f2a6c87f34ee0fd0130a8cf45f81e0705594a;p=kernel%2Fkernel-generic.git

Merge commit 'linus/master' into HEAD

Conflicts:
	MAINTAINERS

Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
---

722f2a6c87f34ee0fd0130a8cf45f81e0705594a