diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /scripts/package | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'scripts/package')
| -rw-r--r-- | scripts/package/buildtar | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/package/buildtar b/scripts/package/buildtar index 83c9c04102f..8a7b15598ea 100644 --- a/scripts/package/buildtar +++ b/scripts/package/buildtar | |||
| @@ -92,7 +92,7 @@ case "${ARCH}" in | |||
| 92 | echo "" >&2 | 92 | echo "" >&2 |
| 93 | echo '** ** ** WARNING ** ** **' >&2 | 93 | echo '** ** ** WARNING ** ** **' >&2 |
| 94 | echo "" >&2 | 94 | echo "" >&2 |
| 95 | echo "Your architecture did not define any architecture-dependant files" >&2 | 95 | echo "Your architecture did not define any architecture-dependent files" >&2 |
| 96 | echo "to be placed into the tarball. Please add those to ${0} ..." >&2 | 96 | echo "to be placed into the tarball. Please add those to ${0} ..." >&2 |
| 97 | echo "" >&2 | 97 | echo "" >&2 |
| 98 | sleep 5 | 98 | sleep 5 |