1. 08 May, 2013 3 commits
  2. 03 May, 2013 2 commits
  3. 29 Apr, 2013 1 commit
    • John W. Linville's avatar
      Merge tag 'nfc-next-3.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next · a8a48e60
      John W. Linville authored
      Samuel Ortiz <sameo@linux.intel.com> says:
      
      "With this one we have:
      
      - One patch for moving the LLCP code into net/nfc.
        It fixes a build annoyance reported by Dave Miller caused by the fact
        that the LLCP code object targets are not in the same directory as the
        Makefile trying to build them is. It prevents us from doing e.g.
      
              make net/nfc/llcp/sock.o
      
        Moving the LLCP code into net/nfc and not making it optional anymore
        makes sense as LLCP is a fundamental piece of the NFC specifications
        and thus should be in the core NFC directory.
      
      - One patch that fixes the missing dependency against RFKILL. Without it NFC
        fails to properly build when it's builtin and CONFIG_RFKILL=m."
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      a8a48e60
  4. 26 Apr, 2013 11 commits
  5. 23 Apr, 2013 23 commits