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: v2.6.31-rc1~303^2
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=722f2a6c87f34ee0fd0130a8cf45f81e0705594a

Merge commit 'linus/master' into HEAD

Conflicts:
	MAINTAINERS

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

722f2a6c87f34ee0fd0130a8cf45f81e0705594a