From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 26 Jun 2012 18:23:41 +0000 (-0400)
Subject: Merge branch 'for-wireless' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... 
X-Git-Tag: v3.5-rc6~18^2~5^2^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=161ae88744bdcef15058a38f101b06308d8824d4;p=linux.git

Merge branch 'for-wireless' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0
---

161ae88744bdcef15058a38f101b06308d8824d4