Merge branch 'smc91x' into pxa-viper
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 7 Sep 2008 16:34:57 +0000 (17:34 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 7 Sep 2008 16:34:57 +0000 (17:34 +0100)
commita929752c4b0b162d5091673bddb2a734bd3df45d
treea3264bb57ddbef2a0465acd7af47c79e79e1904b
parent57a7a62eb65b35f51814382b0841ff99be242880
parentb0dbcf511c4bd10350902e79a1bdd4f5dcca66b6
Merge branch 'smc91x' into pxa-viper