]> git.hungrycats.org Git - linux/commit
Manual merge
authorLinus Torvalds <torvalds@home.osdl.org>
Fri, 18 Jul 2003 02:56:15 +0000 (19:56 -0700)
committerLinus Torvalds <torvalds@home.osdl.org>
Fri, 18 Jul 2003 02:56:15 +0000 (19:56 -0700)
commite922acb7c731c47f6a1c25d5ef42f3dd42468ee1
tree14c6e97441031d3af01ae485f7966b98cb3ce628
parentc4aeb06d199f0da77b30bc1ecf8f474aa4b4703a
parent181d4330bda34cac1cce8f2c34d79fae5dec5f94
Manual merge
drivers/char/watchdog/shwdt.c
drivers/scsi/pas16.c
drivers/scsi/qla1280.c
drivers/scsi/qlogicfas.c
drivers/scsi/sym53c8xx.c
fs/jbd/transaction.c
kernel/sys.c