diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 10:14:56 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 10:14:56 +0200 |
commit | 48ae74443403ab25876959e84785f61bf421ccef (patch) | |
tree | dd6d8277f2f0e691edf49a38ff9a804f9a1532d0 /arch/x86/kernel/entry_32.S | |
parent | Merge branch 'x86/step' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland into x86/step (diff) | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 (diff) | |
download | linux-dev-48ae74443403ab25876959e84785f61bf421ccef.tar.xz linux-dev-48ae74443403ab25876959e84785f61bf421ccef.zip |
Merge branch 'linus' into x86/step
Diffstat (limited to 'arch/x86/kernel/entry_32.S')
0 files changed, 0 insertions, 0 deletions