merge Linus head tree into my drm tree and fix up conflicts

1 files changed, 2 insertions, 0 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index d8ee38aede26..f2ee673329a7 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -295,11 +295,13 @@ static int do_pcmcia_entry(const char *filename,
 {
         unsigned int i;
 
+        id->match_flags = TO_NATIVE(id->match_flags);
         id->manf_id = TO_NATIVE(id->manf_id);
         id->card_id = TO_NATIVE(id->card_id);
         id->func_id = TO_NATIVE(id->func_id);
         id->function = TO_NATIVE(id->function);
         id->device_no = TO_NATIVE(id->device_no);
+
         for (i=0; i<4; i++) {
                 id->prod_id_hash[i] = TO_NATIVE(id->prod_id_hash[i]);
        }