Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Trivial conflict in net/core/filter.c, a locally computed
'sdif' is now an argument to the function.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 4e46dc9e41ad..11e1663bdc4d 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1410,7 +1410,7 @@ static int init_q(struct fs_dev *dev, struct queue *txq, int queue,
 
         func_enter ();
 
-        fs_dprintk (FS_DEBUG_INIT, "Inititing queue at %x: %d entries:\n", 
+        fs_dprintk (FS_DEBUG_INIT, "Initializing queue at %x: %d entries:\n",
                     queue, nentries);
 
         p = aligned_kmalloc (sz, GFP_KERNEL, 0x10);
@@ -1443,7 +1443,7 @@ static int init_fp(struct fs_dev *dev, struct freepool *fp, int queue,
 {
         func_enter ();
 
-        fs_dprintk (FS_DEBUG_INIT, "Inititing free pool at %x:\n", queue);
+        fs_dprintk (FS_DEBUG_INIT, "Initializing free pool at %x:\n", queue);
 
         write_fs (dev, FP_CNF(queue), (bufsize * RBFP_RBS) | RBFP_RBSVAL | RBFP_CME);
         write_fs (dev, FP_SA(queue),  0);