]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b9974dc a98f8fd)
Merge branch 'x86/apic' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Thu, 18 Dec 2008 10:55:06 +0000 (11:55 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 18 Dec 2008 10:55:12 +0000 (11:55 +0100)
commit9a3d8f735eee90bb5b1351983e946bc637041c01
treebdbe6d9f986e9715f8d9b45499f969fa7b51c6a3tree | snapshot
parentb9974dc6bddd41fbdc2583f196a34fbcebd8b089commit | diff
parenta98f8fd24fb24fcb9a359553e64dd6aac5cf4279commit | diff
Merge branch 'x86/apic' into cpus4096

This done for conflict prevention: we merge it into the cpus4096 tree
because upcoming cpumask changes will touch apic.c that would collide
with x86/apic otherwise.
arch/x86/kernel/apic.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.