Merge mulgrave-w:git/linux-2.6
authorJames Bottomley <jejb@sparkweed.localdomain>
Sun, 24 Sep 2006 02:03:52 +0000 (21:03 -0500)
committerJames Bottomley <jejb@sparkweed.localdomain>
Sun, 24 Sep 2006 02:03:52 +0000 (21:03 -0500)
commit1aedf2ccc60fade26c46fae12e28664d0da3f199
treed91083e3079f1ddb942a382ac2b5a7525570ad59
parentdfdc58ba354adb80d67c99f7be84f95a8e02e466
parent1ab9dd0902df4f4ff56fbf672220549090ab28ba
Merge mulgrave-w:git/linux-2.6

Conflicts:

include/linux/blkdev.h

Trivial merge to incorporate tag prototypes.
block/ll_rw_blk.c
include/linux/blkdev.h