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, 1 deletions

diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index 38a26df4095f..f3efbd177ae7 100644
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -1525,7 +1525,7 @@ struct sk_buff	*pMessage)	/* pointer to send-message              */
         ** This is to resolve faulty padding by the HW with 0xaa bytes.
         */
         if (BytesSend < C_LEN_ETHERNET_MINSIZE) {
-                if ((pMessage = skb_padto(pMessage, C_LEN_ETHERNET_MINSIZE)) == NULL) {
+                if (skb_padto(pMessage, C_LEN_ETHERNET_MINSIZE)) {
                         spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
                         return 0;
                 }