1aedf2ccc60fade26c46fae12e28664d0da3f199 - linux-mtk

commit: 1aedf2ccc60fade26c46fae12e28664d0da3f199
[log] [tgz]
author: James Bottomley <jejb@sparkweed.localdomain>
Sat Sep 23 21:03:52 2006 -0500
committer: James Bottomley <jejb@sparkweed.localdomain>
Sat Sep 23 21:03:52 2006 -0500
tree: d91083e3079f1ddb942a382ac2b5a7525570ad59
parent: dfdc58ba354adb80d67c99f7be84f95a8e02e466 [diff]
parent: 1ab9dd0902df4f4ff56fbf672220549090ab28ba [diff]

Merge mulgrave-w:git/linux-2.6

Conflicts:

	include/linux/blkdev.h

Trivial merge to incorporate tag prototypes.

tree: d91083e3079f1ddb942a382ac2b5a7525570ad59