]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit39c2386314642898b1519337632709c084e6791c
treed91083e3079f1ddb942a382ac2b5a7525570ad59
parent992ed7405abc14f8cf0d51b41a25d6b4e952c890
parent420d0ff27d9445371614a06796f16e76b2ca3d88
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