aboutsummaryrefslogtreecommitdiffstats
path: root/net/lapb/lapb_timer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-15 11:38:02 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-15 11:38:02 -0800
commit011331483da8842bc4ab6f2b4e88df60b25eb817 (patch)
tree008d1ce7cf620e26c85bcd5ca6ffcf5526fb4be9 /net/lapb/lapb_timer.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff)
parent[S390] fix s390x_newuname (diff)
downloadlinux-dev-011331483da8842bc4ab6f2b4e88df60b25eb817.tar.xz
linux-dev-011331483da8842bc4ab6f2b4e88df60b25eb817.zip
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] fix s390x_newuname [S390] dasd: log sense for fatal errors [S390] cpu topology: fix locking [S390] cio: Fix refcount after moving devices. [S390] ftrace: fix kernel stack backchain walking [S390] ftrace: disable tracing on idle psw [S390] lockdep: fix compile bug [S390] kvm_s390: Fix oops in virtio device detection with "mem=" [S390] sclp: emit error message if assign storage fails [S390] Fix range for add_active_range() in setup_memory()
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions