Merge branch 'drbd-8.4_ed6' into for-3.8-drivers-drbd-8.4_ed6
[pandora-kernel.git] / Documentation / nfc /
drwxr-xr-x   ..
-rw-r--r-- 9555 nfc-hci.txt
-rw-r--r-- 3503 nfc-pn544.txt