From: Jens Axboe <jaxboe@fusionio.com>
Date: Thu, 10 Mar 2011 07:58:35 +0000 (+0100)
Subject: Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core
X-Git-Tag: v2.6.39-rc1~80^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c63f5646e405b5010cc9499419060bf2e838f5b;p=pandora-kernel.git

Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core

Conflicts:
	block/blk-core.c
	block/blk-flush.c
	drivers/md/raid1.c
	drivers/md/raid10.c
	drivers/md/raid5.c
	fs/nilfs2/btnode.c
	fs/nilfs2/mdt.c

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

4c63f5646e405b5010cc9499419060bf2e838f5b
Reading git-diff-tree failed