From: David S. Miller <davem@davemloft.net>
Date: Wed, 1 Oct 2008 13:12:56 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.28-rc1~717^2~161
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b262e60309e1b0eb25d300c7e739427d5316abb1;p=pandora-kernel.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/ath9k/core.c
	drivers/net/wireless/ath9k/main.c
	net/core/dev.c
---

b262e60309e1b0eb25d300c7e739427d5316abb1
Reading git-diff-tree failed