Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 20 Jun 2005 18:37:49 +0000 (11:37 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 20 Jun 2005 18:37:49 +0000 (11:37 -0700)
commit91b90475e793e84a57d956af8c52645e292badcb
tree8de670e02f99a2a2bde82384104dcb8cb09cdadf
parentbcc408b75b707f46da1f81058ffa3c9df6f0170f
parentf0ffeddc897a5cc5d5c6cc1b99a8799a8b34b28f
Merge master.kernel.org:/home/rmk/linux-2.6-arm