Merge branch 'orion-fixes2'
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 29 Apr 2008 20:31:13 +0000 (21:31 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 29 Apr 2008 20:31:13 +0000 (21:31 +0100)
commit9d87dd97ffcd3b5eb2bbaf0d5d93f4bfcaed3f04
tree64f5fdfc195e92081426db6185dbebe0f4373a81
parent92794a5d6359f9e8ed0d43fe0f3c653f748dcc90
parent0ed1507183adea174bc4b6611b50d90e044730c2
Merge branch 'orion-fixes2'