Commits

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
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