aboutsummaryrefslogtreecommitdiffstats
path: root/net/lapb/lapb_in.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2010-03-04 16:24:47 +0000
committerLinus Torvalds <[email protected]>2010-03-04 16:24:47 +0000
commit6895210e89df20520916c94a4dc148a43229053e (patch)
tree60b137cccd4a57bb98bbfed55a42859e4b60c8db /net/lapb/lapb_in.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6 (diff)
parentsparc64: Make prom entry spinlock NMI safe. (diff)
downloadkernel-6895210e89df20520916c94a4dc148a43229053e.tar.gz
kernel-6895210e89df20520916c94a4dc148a43229053e.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Make prom entry spinlock NMI safe. sparc64: Kill off old sys_perfctr system call and state. sparc: Update defconfigs. sparc: Provide io{read,write}{16,32}be().
Diffstat (limited to 'net/lapb/lapb_in.c')
0 files changed, 0 insertions, 0 deletions