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

Conflicts:

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
index 23476c2ebfc4..efa2ba7c6005 100644
--- a/arch/x86/vdso/vclock_gettime.c
+++ b/arch/x86/vdso/vclock_gettime.c
@@ -106,9 +106,9 @@ int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
                 do_realtime((struct timespec *)tv);
                 tv->tv_usec /= 1000;
                 if (unlikely(tz != NULL)) {
-                        /* This relies on gcc inlining the memcpy. We'll notice
-                           if it ever fails to do so. */
-                        memcpy(tz, &gtod->sys_tz, sizeof(struct timezone));
+                        /* Avoid memcpy. Some old compilers fail to inline it */
+                        tz->tz_minuteswest = gtod->sys_tz.tz_minuteswest;
+                        tz->tz_dsttime = gtod->sys_tz.tz_dsttime;
                 }
                 return 0;
         }