summaryrefslogtreecommitdiff
path: root/Documentation/nfc
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2016-04-18 12:18:55 +0300
committerJiri Kosina <jkosina@suse.cz>2016-04-18 12:18:55 +0300
commit9938b04472d5c59f8bd8152a548533a8599596a2 (patch)
tree0fc8318100878c5e446076613ec02a97aa179119 /Documentation/nfc
parentbd7ced98812dbb906950d8b0ec786f14f631cede (diff)
parentc3b46c73264b03000d1e18b22f5caf63332547c9 (diff)
downloadlinux-9938b04472d5c59f8bd8152a548533a8599596a2.tar.xz
Merge branch 'master' into for-next
Sync with Linus' tree so that patches against newer codebase can be applied. Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'Documentation/nfc')
0 files changed, 0 insertions, 0 deletions