From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 28 Sep 2012 15:11:16 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~47^2~31^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c487606f835a93a725bac1aefd536be98f22474d;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	net/nfc/netlink.c

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

c487606f835a93a725bac1aefd536be98f22474d
Reading git-diff-tree failed