summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-29 04:48:03 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-29 04:48:03 +0200
commit224b148ef7c9a00642eb33dbdf62f2840bde974f (patch)
tree1236762b06beb3565671adc5d554ae2651cd661f /fs
parent[PATCH] send_sigqueue: simplify and fix the race (diff)
parentMerge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linu... (diff)
downloadlinux-224b148ef7c9a00642eb33dbdf62f2840bde974f.tar.xz
linux-224b148ef7c9a00642eb33dbdf62f2840bde974f.zip
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394: ohci1394: cleanup the "Unexpected PCI resource length" warning. sbp2: misc debug logging cleanups sbp2: proper treatment of DID_OK ieee1394: set read permission for parameter disable_irm sbp2: check for ARM failure ohci1394: clean up asynchronous and physical request filters programming ieee1394: remove amdtp remains from ieee1394_core.h ieee1394: remove devfs support Signed-off-by: Jody McIntyre <scjody@modernduck.com> sbp2: prevent unloading of 1394 low-level driver
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions