summaryrefslogtreecommitdiffstats
path: root/drivers/nfc/pn533.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-11-23 11:55:09 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2012-11-23 11:55:09 -1000
commitf3a443af9e85d6c6c7e7506400024a85a8dd9496 (patch)
treeb165e0f429a5273d94709d759dcf6c46299a39b8 /drivers/nfc/pn533.c
parent45aaff067997502aa4cd373f9e9f303661675430 (diff)
parentfae2ae2a900a5c7bb385fe4075f343e7e2d5daa2 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fix from David Miller: "Bug fix from Al Viro" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: not any error from do_sigaltstack() should fail rt_sigreturn()
Diffstat (limited to 'drivers/nfc/pn533.c')
0 files changed, 0 insertions, 0 deletions