Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 3 Feb 2006 23:50:35 +0000 (15:50 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 3 Feb 2006 23:50:35 +0000 (15:50 -0800)
commit1a56f54c351d8d2e276aefc4f4094037c178d6c7
tree88abb7801141db3d03079bd0ef2a903cbf3a1aba
parentd1ffa5669cd834f901141756e63195f48c1bfbf9
parent2c4c6b27028b38204de8ade505f925d53d234422
Merge master.kernel.org:/home/rmk/linux-2.6-arm