Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6

Conflicts:
	net/ipv4/route.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
index 9402543fc20d..e54f6396fa4c 100644
--- a/include/net/caif/cfctrl.h
+++ b/include/net/caif/cfctrl.h
@@ -51,7 +51,7 @@ struct cfctrl_rsp {
         void (*restart_rsp)(void);
         void (*radioset_rsp)(void);
         void (*reject_rsp)(struct cflayer *layer, u8 linkid,
-                                struct cflayer *client_layer);;
+                                struct cflayer *client_layer);
 };
 
 /* Link Setup Parameters for CAIF-Links. */