Merge branch 'machtypes' into orion
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 7 Jul 2008 21:21:34 +0000 (22:21 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 7 Jul 2008 21:21:34 +0000 (22:21 +0100)
commitfa6868508a0102b150ca03d976e3a1c234e4e387
tree2b252f262695544e5caeb2bd983f8cac5158a8f6
parent5b2353859f87748f0707cec57c3953022a3321f3
parent4ed47896935573c8423d05bddda3f269d6e6c613
Merge branch 'machtypes' into orion