summaryrefslogtreecommitdiff
path: root/include/asm-arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-05-09 10:41:28 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-05-09 10:41:28 +0100
commit805f53f085346b6765eda02820721a14ce0d644f (patch)
tree83fb86fa5cc660b2c231cdbd8c4f22c16b64d01f /include/asm-arm
parent23688e999eda70f1ce1c61a68b865b996e3c6c4c (diff)
parentb85fe92766dfc0c4e803cb0cead4c780cd0c02f9 (diff)
parentc5f125031f416ba6350e84462e9039737b6e2bab (diff)
parentcc150b03ae79b20e4c023f71913c1225f8a19a6b (diff)
Merge branches 'armv7', 'at91', 'misc' and 'omap' into devel