From: David S. Miller <davem@davemloft.net>
Date: Fri, 17 Jul 2009 03:21:24 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: upstream/snapshot3+hdmi~17671^2~622
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=da8120355e80ddaf534adb8ed910871d97512d56;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

Conflicts:
	drivers/net/wireless/orinoco/main.c
---

da8120355e80ddaf534adb8ed910871d97512d56