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

Merge branch 'master' into for-2.6.31

Conflicts:
	drivers/ide/ide-io.c

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

9bd7de51ee8537094656149eaf45338cadb7d7d4
Reading git-diff-tree failed