Whamcloud - gitweb
merge from b_devel -> b_ad
authorrread <rread>
Thu, 5 Jun 2003 04:12:56 +0000 (04:12 +0000)
committerrread <rread>
Thu, 5 Jun 2003 04:12:56 +0000 (04:12 +0000)
commit923b41a3913da9536be99ac482b81ff325cf8c58
tree56e50aefdef175e5d8cf1e918f33bdd5eb20c2d7
parent7e84054c6c01e0a28a3b0cedd801b73bf1198cc5
merge from b_devel -> b_ad
  DEVEL_AD_PARENT_20030526 -> DEVEL_AD_PARENT_20030605

Large, squirrelly merge. It mounts, and acceptance_small.sh finishes
the test and then fails in cleanup, just like b_devel.
lnet/include/linux/kernel_compat.h
lustre/llite/llite_lib.c
lustre/obdclass/Makefile.mk
lustre/portals/include/linux/kernel_compat.h