Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 0eb8e885 authored by Jens Axboe's avatar Jens Axboe
Browse files

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
parents af75cd3c 0a58e077
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment