backports: address NFC LLCP code shift
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>
Fri, 17 May 2013 11:00:43 +0000 (04:00 -0700)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 17 May 2013 12:07:10 +0000 (14:07 +0200)
commit92c55efc46f830a3f25ae93c0d568677c3c7b0c9
treef68948c30d50d7ea9ee70a710acd7656187b8ad4
parentadf467743c429f2dea297d0200a93383acd6fc7d
backports: address NFC LLCP code shift

Samuel folded code under net/nfc/llcp/ onto
the parent net/nfc/ directory with llcp_ prefixes
for the files. Address this change introduced
as of next-20130430.

commit 30cc4587659e1c9b1bfade8b2a757d91e04758ab
Author: Samuel Ortiz <sameo@linux.intel.com>
Date:   Fri Apr 26 11:49:40 2013 +0200

    NFC: Move LLCP code to the NFC top level diirectory

    And stop making it optional. LLCP is a fundamental part of the NFC
    specifications and making it optional does not make much sense.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
copy-list