From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 18 Mar 2013 13:39:21 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~65^2~390^2^2~30
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49c87cd1eac1f798c5bad7f7eb809e6df36b6c56;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
	net/nfc/llcp/llcp.c
---

49c87cd1eac1f798c5bad7f7eb809e6df36b6c56
Reading git-diff-tree failed