From: Jens Axboe <jaxboe@fusionio.com>
Date: Tue, 1 Jun 2010 10:42:12 +0000 (+0200)
Subject: Merge branch 'master' into for-linus
X-Git-Tag: v2.6.35-rc2~12^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4ca761577535b2b4d153689ee97342797dfff05;p=pandora-kernel.git

Merge branch 'master' into for-linus

Conflicts:
	fs/pipe.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
---

b4ca761577535b2b4d153689ee97342797dfff05
Reading git-diff-tree failed