From: David S. Miller <davem@davemloft.net>
Date: Thu, 11 Sep 2008 23:08:24 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1f07553a58c65741d6d125621123ecf9093fa0e3;p=linux-beck.git

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

Conflicts:

	drivers/net/wireless/ath9k/beacon.c
	drivers/net/wireless/ath9k/core.h
---

1f07553a58c65741d6d125621123ecf9093fa0e3