Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 30 Jun 2005 03:59:55 +0000 (20:59 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 30 Jun 2005 03:59:55 +0000 (20:59 -0700)
commit92dd7ca0af8f769569bde98a83b4a8f4daec6ac5
tree9217bee214128a4a45b2e0a3d9784d05fea2c8fb
parent164cad9bacc2cf190493d2ee4918dc2869ba6f53
parentda41119af78864d27ccbf505949df788d5e8aaf5
Merge master.kernel.org:/home/rmk/linux-2.6-arm