Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 18 Jan 2006 23:19:40 +0000 (15:19 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 18 Jan 2006 23:19:40 +0000 (15:19 -0800)
commit2149bcabc5f6fd635935d57480044ba4c11bc020
treed0313441c6b8b39dbf3bd840627e57af92a6b929
parent2333f2120759bb2a3edcc0d32b2f310048ee610d
parentd9004eb466d03b7900ed432fecec6819012b4ed3
Merge master.kernel.org:/home/rmk/linux-2.6-serial