commit aee3acd9e44c996643db7805589327e34ac12291
author The Android Open Source Project <initial-contribution@android.com> Thu Jul 22 09:20:31 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 22 09:20:31 2010 -0700
tree 32022e9ac230439e5db88e48a4c0296b84ac1e47
parent 29a96aff5f8b3e4370684064f6a72b33b5d71785
parent ef582bdb8f24197caf921af7bf7ee63503626cdd

am ef582bdb: merge from open-source master

Merge commit 'ef582bdb8f24197caf921af7bf7ee63503626cdd'

* commit 'ef582bdb8f24197caf921af7bf7ee63503626cdd':
  Added NEC and PMC's USB VIDs upon their request.

patch.txt

diff --git a/patch.txt b/patch.txt
new file mode 100644
index 0000000..258965d
--- /dev/null
+++ b/patch.txt
@@ -0,0 +1,16 @@
+diff --git a/init/util.c b/init/util.c
+index 4d98cc2..0667593 100755
+--- a/init/util.c
++++ b/init/util.c
+@@ -657,8 +657,9 @@ static void get_hardware_name(void)
+         if (x) {
+             x += 2;
+             n = 0;
+-            while (*x && !isspace(*x)) {
+-                hardware[n++] = tolower(*x);
++            while (*x && *x != '\n') {
++                if (!isspace(*x))
++                    hardware[n++] = tolower(*x);
+                 x++;
+                 if (n == 31) break;
+             }