Public Git Hosting - ltp-debian.git/commit

Merge branch 'dfsg_clean'

Conflicts:
include/mk/generic_trunk_target.inc
runtest/ltplite
runtest/numa
runtest/stress.part1
runtest/stress.part3
runtest/syscalls
testcases/kernel/containers/netns/common.c
testcases/kernel/controllers/cgroup_fj/Makefile
testcases/kernel/controllers/cpuset/cpuset_memory_pressure_test/cpuset_memory_pressure.c
testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_test.c
testcases/kernel/include/regen.sh
testcases/kernel/performance_counters/performance_counter02.c
testcases/kernel/power_management/Makefile
testcases/kernel/syscalls/fcntl/fcntl11.c
testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
testcases/kernel/syscalls/keyctl/keyctl01.c
testcases/kernel/syscalls/lchown/lchown02.c
testcases/kernel/syscalls/llseek/llseek01.c
testcases/kernel/syscalls/ppoll/ppoll01.c
testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
testcases/kernel/syscalls/socketcall/socketcall03.c
testcases/kernel/syscalls/writev/writev06.c
testcases/kernel/timers/clock_settime/clock_settime03.c

commit	c86080103294baa2b4a4b375feb96676d35485a0
author	Jiri Palecek <jirka@debian.(none)>
	Mon, 14 Dec 2009 13:36:18 +0000 (14 14:36 +0100)
committer	Jiri Palecek <jirka@debian.(none)>
	Mon, 14 Dec 2009 13:36:18 +0000 (14 14:36 +0100)
tree	32af005987e3b0c6e0cd877e842d872db8c0c65e	tree \| snapshot (tar.gz zip)
parent	0161eef22ae5bfe30a7f95b553abb50cb826db0d	commit \| diff
parent	f8c6ba9bd897b7801562a918e785762b5d11f57d	commit \| diff

IDcheck.sh	diff1 \|	diff2 \|	blob \| history
include/mk/automake.mk	diff1 \|	diff2 \|	blob \| history
include/mk/generic_trunk_target.inc	diff1 \|	diff2 \|	blob \| history
include/test.h	diff1 \|	diff2 \|	blob \| history
lib/tst_res.c	diff1 \|	diff2 \|	blob \| history
runtest/ltplite	diff1 \|	diff2 \|	blob \| history
runtest/stress.part1	diff1 \|	diff2 \|	blob \| history
runtest/stress.part3	diff1 \|	diff2 \|	blob \| history
runtest/syscalls	diff1 \|	diff2 \|	blob \| history
testcases/commands/mail/mail_tests.sh	diff1 \|	diff2 \|	blob \| history
testcases/kernel/containers/netns/common.c	diff1 \|	diff2 \|	blob \| history
testcases/kernel/controllers/cgroup/cgroup_regression_test.sh	diff1 \|	diff2 \|	blob \| history
testcases/kernel/controllers/cgroup_fj/Makefile	diff1 \|	diff2 \|	blob \| history
testcases/kernel/controllers/cpuctl_fj/run_cpuctl_test_fj.sh	diff1 \|	diff2 \|	blob \| history
testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_test.c	diff1 \|	diff2 \|	blob \| history
testcases/kernel/fs/doio/rwtest	diff1 \|	diff2 \|	blob \| history
testcases/kernel/fs/quota_remount/quota_remount_test01.sh	diff1 \|	diff2 \|	blob \| history
testcases/kernel/include/regen.sh	diff1 \|	diff2 \|	blob \| history
testcases/kernel/power_management/Makefile	diff1 \|	diff2 \|	blob \| history
testcases/kernel/power_management/runpwtests.sh	diff1 \|	diff2 \|	blob \| history
testcases/kernel/syscalls/clone/clone02.c	diff1 \|	diff2 \|	blob \| history
testcases/kernel/syscalls/fcntl/fcntl11.c	diff1 \|	diff2 \|	blob \| history
testcases/kernel/syscalls/lchown/lchown02.c	diff1 \|	diff2 \|	blob \| history
testcases/network/stress/tcp/uni-basic/tcp4-uni-basic01	diff1 \|	diff2 \|	blob \| history