From: John W. Linville Date: Mon, 14 Jan 2013 20:08:52 +0000 (-0500) Subject: Merge tag 'nfc-next-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... X-Git-Tag: v3.12-rc1~1418^2~242^2^2~26 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50c2f5e8f93c83ddb7fe74057db1e3030724ae6e;p=kernel%2Fkernel-generic.git Merge tag 'nfc-next-3.9-1' of git://git./linux/kernel/git/sameo/nfc-next Samuel Ortiz says: "This is the first NFC patchset targeted at the 3.9 merge window. It brings the following goodies: - LLCP socket timestamping (To be used e.g with the recently released nfctool application for a more efficient skb timestamping when sniffing). - A pretty big pn533 rework from Waldemar, preparing the driver to support more flavours of pn533 based devices. - HCI changes from Eric in preparation for the microread driver support. - Some LLCP memory leak fixes, cleanups and slight improvements. - pn544 and nfcwilink move to the devm_kzalloc API. - An initial Secure Element (SE) API. - An nfc.h license change from the original author, allowing non GPL application code to safely include it." Signed-off-by: John W. Linville --- 50c2f5e8f93c83ddb7fe74057db1e3030724ae6e