From: Jens Axboe <jaxboe@fusionio.com>
Date: Tue, 19 Oct 2010 07:13:04 +0000 (+0200)
Subject: Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier
X-Git-Tag: v2.6.37-rc1~166^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa251f89903d73989e2f63e13d0eaed1e07ce0da;p=pandora-kernel.git

Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier

Conflicts:
	block/blk-core.c
	drivers/block/loop.c
	mm/swapfile.c

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

fa251f89903d73989e2f63e13d0eaed1e07ce0da
Reading git-diff-tree failed