Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 475dc3e in mainline for kernel/arch/ia64/src/ia64.c


Ignore:
Timestamp:
2012-02-19T09:48:20Z (10 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master
Children:
1ebb66f
Parents:
a7d6185 (diff), ec8c622 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia64/src/ia64.c

    ra7d6185 r475dc3e  
    144144#endif
    145145#ifdef MACHINE_i460GX
    146         platform = "i460GX";
     146        platform = "pc";
    147147#endif
    148148        sysinfo_set_item_data("platform", NULL, (void *) platform,
Note: See TracChangeset for help on using the changeset viewer.