52 Commits (09cfd3c52ea76f43b3cb15e570aeddf633d65e80)

Author	SHA1	Message	Date
John W. Linville	17a2911f33	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-04-29 15:31:57 -04:00
Samuel Ortiz	30cc458765	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>	2013-04-26 12:37:28 +02:00