From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 19 Mar 2010 07:05:10 +0000 (+0100)
Subject: Merge branch 'master' into for-linus
X-Git-Tag: v2.6.34-rc4~11^2~11
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=b4b7a4ef097f288f724420b473dbf92a89c0ab7e

Merge branch 'master' into for-linus

Conflicts:
	block/Kconfig

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

b4b7a4ef097f288f724420b473dbf92a89c0ab7e