| commit | f845a35288aa57bced03c1dbb30c9dbb78be5886 | |
| author | Jiri Palecek <jirka@debian.(none)> | |
| Sun, 26 Jul 2009 00:04:33 +0000 (26 02:04 +0200) | ||
| committer | Jiri Palecek <jirka@debian.(none)> | |
| Sun, 26 Jul 2009 00:04:33 +0000 (26 02:04 +0200) | ||
| tree | 0409adb8583f1c3127e359f1bbefda418e482b26 | treesnapshot (tar.gz zip) |
| parent | 923e127efd8e380b6558fe342750c0719769beb5 | commitdiff |
| parent | 67fcc6fd30d95ee37cfa0da807f264afceb45d8f | commitdiff |
Merge branch 'dfsg_clean'
Conflicts:
runalltests.sh
testcases/commands/ade/file/file_test.sh
testcases/commands/cron/cron02
testcases/commands/cron/cron03
testcases/commands/su/su01
testcases/kernel/Makefile
testcases/kernel/containers/netns/parent_1.sh
testcases/kernel/containers/netns/parent_2.sh
testcases/kernel/containers/netns/parentns.sh
testcases/kernel/containers/netns/paripv6.sh
testcases/kernel/power_management/runpwtests.sh
testcases/kernel/syscalls/eventfd2/eventfd2_03.c
testcases/kernel/syscalls/ioctl/test_ioctl
testcases/network/nfs/nfs03/nfs03
Conflicts:
runalltests.sh
testcases/commands/ade/file/file_test.sh
testcases/commands/cron/cron02
testcases/commands/cron/cron03
testcases/commands/su/su01
testcases/kernel/Makefile
testcases/kernel/containers/netns/parent_1.sh
testcases/kernel/containers/netns/parent_2.sh
testcases/kernel/containers/netns/parentns.sh
testcases/kernel/containers/netns/paripv6.sh
testcases/kernel/power_management/runpwtests.sh
testcases/kernel/syscalls/eventfd2/eventfd2_03.c
testcases/kernel/syscalls/ioctl/test_ioctl
testcases/network/nfs/nfs03/nfs03
15 files changed: