Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/sched/sch_hfsc.c
	net/sched/sch_htb.c
	net/sched/sch_tbf.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c
index bca9cb89a118..487a54739854 100644
--- a/drivers/atm/idt77105.c
+++ b/drivers/atm/idt77105.c
@@ -151,7 +151,7 @@ static int fetch_stats(struct atm_dev *dev,struct idt77105_stats __user *arg,int
         spin_unlock_irqrestore(&idt77105_priv_lock, flags);
         if (arg == NULL)
                 return 0;
-        return copy_to_user(arg, &PRIV(dev)->stats,
+        return copy_to_user(arg, &stats,
                     sizeof(struct idt77105_stats)) ? -EFAULT : 0;
 }