Merge refs/heads/upstream-fixes from...

Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

drivers/net/s2io.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -762,8 +762,8 @@ static inline u64 readq(void __iomem *addr)
		{
		u64 ret = 0;
		ret = readl(addr + 4);
		(u64) ret <<= 32;
		(u64) ret \|= readl(addr);
		ret <<= 32;
		ret \|= readl(addr);

		return ret;
		}