summaryrefslogtreecommitdiff
path: root/net/nfc
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-04-06 19:35:03 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2017-04-06 19:35:03 -0400
commitfccfb9950836524d79260448fba6131f6b1d73c3 (patch)
treea6fef32e330852138d9e7bd12d7b3dd97c4360c3 /net/nfc
parentd597580d373774b1bdab84b3d26ff0b55162b916 (diff)
parentb4fb8f66f1ae2e167d06c12d018025a8d4d3ba7e (diff)
downloadlinux-fccfb9950836524d79260448fba6131f6b1d73c3.tar.gz
linux-fccfb9950836524d79260448fba6131f6b1d73c3.tar.xz
Merge commit 'b4fb8f66f1ae2e167d06c12d018025a8d4d3ba7e' into uaccess.ia64
backmerge of mainline ia64 fix
Diffstat (limited to 'net/nfc')
0 files changed, 0 insertions, 0 deletions