Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 31 Jan 2006 19:31:02 +0000 (11:31 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 31 Jan 2006 19:31:02 +0000 (11:31 -0800)
commitbb4bc81a234c66e8d8a4475110fa2d7988a34671
treedd97395a565e8e6fc05f58bb0d3cba8f300d114d
parentadac1665234dd966990af846eccd20b7f4923279
parent14e54cc391e22bd564993583464577e4e34a2701
Merge master.kernel.org:/home/rmk/linux-2.6-arm