Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / net / caif / cfrfml.c

diff --git a/net/caif/cfrfml.c b/net/caif/cfrfml.c
index 2b563ad04597de1b049e8d52c4944d9ed48b5da3..61d7617d924912347325a5db483172794e6df33a 100644 (file)
--- a/net/caif/cfrfml.c
+++ b/net/caif/cfrfml.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) ST-Ericsson AB 2010
- * Author:     Sjur Brendeland/sjur.brandeland@stericsson.com
+ * Author:     Sjur Brendeland
  * License terms: GNU General Public License (GPL) version 2
  */
 
@@ -43,7 +43,7 @@ static void cfrfml_release(struct cflayer *layer)
 }
 
 struct cflayer *cfrfml_create(u8 channel_id, struct dev_info *dev_info,
-                                       int mtu_size)
+                             int mtu_size)
 {
        int tmp;
        struct cfrfml *this = kzalloc(sizeof(struct cfrfml), GFP_ATOMIC);
@@ -69,7 +69,7 @@ struct cflayer *cfrfml_create(u8 channel_id, struct dev_info *dev_info,
 }
 
 static struct cfpkt *rfm_append(struct cfrfml *rfml, char *seghead,
-                       struct cfpkt *pkt, int *err)
+                               struct cfpkt *pkt, int *err)
 {
        struct cfpkt *tmppkt;
        *err = -EPROTO;