From: Jens Axboe <jens.axboe@oracle.com>
Date: Thu, 29 Apr 2010 07:36:24 +0000 (+0200)
Subject: Merge branch 'master' into for-2.6.35
X-Git-Tag: v2.6.35-rc1~442^2~60
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7407cf355fdf5500430be966dbbde84a27293bad;p=pandora-kernel.git

Merge branch 'master' into for-2.6.35

Conflicts:
	fs/block_dev.c

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

7407cf355fdf5500430be966dbbde84a27293bad
Reading git-diff-tree failed