Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/cifs/export.c

1 files changed, 1 insertions, 1 deletions

diff --git a/include/linux/kernelcapi.h b/include/linux/kernelcapi.h
index aea34e74c496..8c4350a9ed87 100644
--- a/include/linux/kernelcapi.h
+++ b/include/linux/kernelcapi.h
@@ -64,7 +64,7 @@ struct capi20_appl {
         unsigned long nrecvdatapkt;
         unsigned long nsentctlpkt;
         unsigned long nsentdatapkt;
-        struct semaphore recv_sem;
+        struct mutex recv_mtx;
         struct sk_buff_head recv_queue;
         struct work_struct recv_work;
         int release_in_progress;