Merge remote branch 'cros/upstream' into master
Merged to upstream autotest @4749~@5215.
The entire change list description is too big to enlist here. Please refer to upstream (http://autotest.kernel.org/browser) for more details.
BUG=
TEST=emerged both x86 and arm build.
Tested emerged x86 build bvt against a chromeos device.
Review URL: http://codereview.chromium.org/6246035
Change-Id: I8455f2135c87c321c6efc232e2869dc8f675395e
diff --git a/.gitignore b/.gitignore
index 355a9e3..ec559c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,8 @@
private_host_attributes_config.py
# default svn:ignore property:
+*.o
+#*#
.*.rej
*.rej
.*~
@@ -27,9 +29,13 @@
.#*
.DS_Store.
# additional patterns:
+*.pyc
client/control
client/results/
client/tests/kvm/images
client/tests/kvm/env
client/tmp
client/tests/kvm/*.cfg
+server/tmp
+tko/parsers/test/site_scenarios
+ExternalSource