From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 22 May 2009 18:25:34 +0000 (+0200)
Subject: Merge branch 'master' into for-2.6.31
X-Git-Tag: v2.6.31-rc1~389^2~36
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4b636366c00738b9609cda307014d71b1225b7f;p=pandora-kernel.git

Merge branch 'master' into for-2.6.31

Conflicts:
	drivers/block/hd.c
	drivers/block/mg_disk.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

e4b636366c00738b9609cda307014d71b1225b7f
Reading git-diff-tree failed