From: Ortiz, Samuel <samuel.ortiz@intel.com>
Date: Fri, 27 Jul 2012 07:52:38 +0000 (-0700)
Subject: Merge changes Ib85ed842,I74d3677b into devel
X-Git-Tag: 2.1b_release~75^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bb4179e947d246969c6e5b051f932884f75ebb31;p=kernel%2Fkernel-mfld-blackbay.git

Merge changes Ib85ed842,I74d3677b into devel

* changes:
  compact nfc 3.0.8
  x86 pn544 blackbay
---

bb4179e947d246969c6e5b051f932884f75ebb31