Automatic merge of master.kernel.org:/home/rmk/linux-2.6-arm
commit35d1bc90546d1f0af198886ae8062a550142d926
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 14:57:17 +0000 (8 07:57 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 14:57:17 +0000 (8 07:57 -0700)
tree5aa33046f09436fa292cdcdf6e6db138db6cf58a
parent1d6757fbff5bc86e94e59ab0d7bdd7e71351d839
parentf8f98a9335db4a7d6285b785180fad720bf22864
Merge ... kernel.org:/home/rmk/linux-2.6-arm