From: David S. Miller <davem@davemloft.net>
Date: Sat, 6 Dec 2008 06:54:40 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.29-rc1~581^2~293
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=730c30ec646bd252a9448a66ecd51d794853513f;p=pandora-kernel.git

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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-sta.c
---

730c30ec646bd252a9448a66ecd51d794853513f
Reading git-diff-tree failed