Merge branch 'origin'
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Sep 2010 21:38:43 +0000 (22:38 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Sep 2010 21:38:43 +0000 (22:38 +0100)
commitde9ea203d105f760e8e995c07aa80e855a9aedba
tree75e4702e98a0b3ea9ed6d085f74474a70642909b
parent2be23c475af8ae4e25f8bab08d815b17593bd547
parentd56557af19867edb8c0e96f8e26399698a08857f
Merge branch 'origin'