Changeset cf2af94 in mainline for kernel/arch/ia64/include/bootinfo.h


Ignore:
Timestamp:
2011-02-09T11:46:47Z (14 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cb15135a
Parents:
a49c4002 (diff), 0b37882 (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 mainline changes

Local modifications:

  • change pipefs and ext2 to build again (use async_* calls instead of ipc_*)
File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ia64/include/bootinfo.h

    ra49c4002 rcf2af94  
    6262        unsigned int memmap_items;
    6363       
    64         unative_t *sapic;
     64        sysarg_t *sapic;
    6565        unsigned long sys_freq;
    6666        unsigned long freq_scale;
Note: See TracChangeset for help on using the changeset viewer.