aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-13 09:47:32 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-13 09:47:32 +0100
commit7032e8696726354d6180d8a2d17191f958cd93ae (patch)
tree5af02052e633bcde0e33f77cac52ab4685ad07f1 /arch
parentf268fe7333ccd16e3e5b7de0be1df201e40a8e7c (diff)
parent3bd323a1da42525317e2ce6c93b97b5ba653bc9d (diff)
parentb13e24644c138d0ddbc451403c30a96b09bfd556 (diff)
Merge branches 'x86/paravirt', 'x86/pat', 'x86/setup-v2', 'x86/subarch', 'x86/uaccess' and 'x86/urgent' into x86/core