Merge branch 'locking'

author Ben Pfaff <blp@nicira.com>

Thu, 24 Jul 2008 23:07:32 +0000 (16:07 -0700)

committer Ben Pfaff <blp@nicira.com>

Thu, 24 Jul 2008 23:07:32 +0000 (16:07 -0700)
author Ben Pfaff <blp@nicira.com>
Thu, 24 Jul 2008 23:07:32 +0000 (16:07 -0700)
committer Ben Pfaff <blp@nicira.com>
Thu, 24 Jul 2008 23:07:32 +0000 (16:07 -0700)
diff --cc datapath/datapath.c
Simple merge
diff --cc datapath/hwtable_dummy/hwtable_dummy.c
Simple merge
diff --cc datapath/table-linear.c
Simple merge
author	Ben Pfaff <blp@nicira.com>
	Thu, 24 Jul 2008 23:07:32 +0000 (16:07 -0700)
committer	Ben Pfaff <blp@nicira.com>
	Thu, 24 Jul 2008 23:07:32 +0000 (16:07 -0700)
		1	2
datapath/datapath.c	patch \|	diff1 \|	diff2 \|	blob \| history
datapath/hwtable_dummy/hwtable_dummy.c	patch \|	diff1 \|	diff2 \|	blob \| history
datapath/table-linear.c	patch \|	diff1 \|	diff2 \|	blob \| history