Pileus Git - ~andy/linux/commit

author	Jens Axboe <jaxboe@fusionio.com>
	Fri, 20 May 2011 18:36:16 +0000 (20:36 +0200)
committer	Jens Axboe <jaxboe@fusionio.com>
	Fri, 20 May 2011 18:36:16 +0000 (20:36 +0200)
commit	0eb8e885726a3a93206510092bbc7e39e272f6ef
tree	d866a663df8d7d0f6a405d7eba45d889c12ba8bb	tree \| snapshot
parent	af75cd3c67845ebe31d2df9a780889a5ebecef11	commit \| diff
parent	0a58e077eb600d1efd7e54ad9926a75a39d7f8ae	commit \| diff

Merge branch 'for-linus' into for-2.6.40/core

This patch merges in a fix that missed 2.6.39 final.

Conflicts:
block/blk.h