From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 21 May 2010 19:27:26 +0000 (+0200)
Subject: Merge branch 'master' into for-2.6.35
X-Git-Tag: v2.6.35-rc1~442^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee9a3607fb03e804ddf624544105f4e34260c380;p=pandora-kernel.git

Merge branch 'master' into for-2.6.35

Conflicts:
	fs/ext3/fsync.c

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

ee9a3607fb03e804ddf624544105f4e34260c380
Reading git-diff-tree failed