From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 11 Jun 2012 18:46:04 +0000 (-0400)
Subject: Merge tag 'nfc-next-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0
X-Git-Tag: v3.6-rc1~125^2~559^2~6
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2e48686835370dfe78697839ca293d250793809d;p=linux.git

Merge tag 'nfc-next-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0
---

2e48686835370dfe78697839ca293d250793809d