Skip to content
GitLab
Commit 1aedf2cc authored by James Bottomley's avatar James Bottomley
Browse files

Merge mulgrave-w:git/linux-2.6 

Conflicts:

	include/linux/blkdev.h

Trivial merge to incorporate tag prototypes.
parents dfdc58ba 1ab9dd09
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment