Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/x86
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Feb 2006 00:21:44 +0000 (16:21 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Feb 2006 00:21:44 +0000 (16:21 -0800)
commitb8c475be7bf9b79e6417c08d7a921b2e8cb04258
tree86a669a52c077b4568e52c9012cf279862d457e9
parent10379a25fee8ddc8698d2f6c54ccedd4664c2941
parent6fe8f479d02e47c80f816b2b9f5d3996ebfe6af6
Merge /pub/scm/linux/kernel/git/davej/x86