Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index bb5ad479210b..c1c3452c90ca 100644
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
@@ -968,8 +968,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
         /* The old LANCE chips doesn't automatically pad buffers to min. size. */
         if (chip_table[lp->chip_version].flags & LANCE_MUST_PAD) {
                 if (skb->len < ETH_ZLEN) {
-                        skb = skb_padto(skb, ETH_ZLEN);
-                        if (skb == NULL)
+                        if (skb_padto(skb, ETH_ZLEN))
                                 goto out;
                         lp->tx_ring[entry].length = -ETH_ZLEN;
                 }