Merge branch 'master' into xkb

Conflicts:
	config.make.in
	configure.in

1 files changed, 1 insertions, 1 deletions

diff --git a/pfinet/linux-src/include/linux/cdk.h b/pfinet/linux-src/include/linux/cdk.h
index 2180e433..2fab8949 100644
--- a/pfinet/linux-src/include/linux/cdk.h
+++ b/pfinet/linux-src/include/linux/cdk.h
@@ -149,7 +149,7 @@ typedef struct cdkhdr {
 /*
  *	Define the memory mapping structure. This structure is pointed to by
  *	the memp field in the stlcdkhdr struct. As many as these structures
- *	as required are layed out in shared memory to define how the rest of
+ *	as required are laid out in shared memory to define how the rest of
  *	shared memory is divided up. There will be one for each port.
  */
 typedef struct cdkmem {