← Back to branch summary

~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to arch/x86/include/uapi/asm/bootparam.h

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/include/uapi/asm/bootparam.h
158
158
        X86_SUBARCH_PC = 0,
159
159
        X86_SUBARCH_LGUEST,
160
160
        X86_SUBARCH_XEN,
161
 
        X86_SUBARCH_MRST,
 
161
        X86_SUBARCH_INTEL_MID,
162
162
        X86_SUBARCH_CE4100,
163
163
        X86_NR_SUBARCHS,
164
164
};