From: David S. Miller <davem@davemloft.net>
Date: Mon, 1 Apr 2013 17:36:50 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~65^2~253
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a210576cf891e9e6d2c238eabcf5c1286b1e7526;p=pandora-kernel.git

Merge git://git./linux/kernel/git/davem/net

Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h

Two minor conflicts in wireless.  Overlapping additions of extern
declarations in net/wireless/core.h and a bug fix overlapping with
the addition of a boolean parameter to __ieee80211_key_free().

Signed-off-by: David S. Miller <davem@davemloft.net>
---

a210576cf891e9e6d2c238eabcf5c1286b1e7526
Reading git-diff-tree failed