Merge branch 'x86/setup' of ssh://master.kernel.org/pub/scm/linux/kernel/git/tip...
authorIngo Molnar <mingo@elte.hu>
Thu, 17 Jul 2008 21:32:58 +0000 (23:32 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Jul 2008 21:32:58 +0000 (23:32 +0200)
commitffaa152efd02849c0c36947f533f2ee3ee55369a
tree1f4cac0e1d7ef89bf24ba3fc9c0676f679aaaf4c
parent4fdf08b5bf8d449cc9897395895157c6ff8ddc41
parentf910d134442f11b5b69edbb7a93e63c3296b3a36
Merge branch 'x86/setup' of ssh:///linux/kernel/git/tip/linux-2.6-tip into x86/setup