projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dda3b19 300c627)
Merge tag 'nfc-fixes-3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 22 Sep 2014 19:57:46 +0000 (15:57 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 22 Sep 2014 19:57:46 +0000 (15:57 -0400)
Samuel Ortiz <sameo@linux.intel.com> says:

"NFC: 3.17 fixes

We have 3 NFC fixes for 3.17:

- 2 potential build failures for ST21NFCA and ST21NFCB, triggered by a
  depmod dependenyc cycle.
- One potential buffer overflow in the microread driver."

Signed-off-by: John W. Linville <linville@tuxdriver.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.