aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-11-29 15:57:19 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-11-29 15:57:19 -0500
commite252d4c362ad89c5b533833d9e7493c732215925 (patch)
treeb04bd423b5a8f192ff1ad7f6f9db5f73b9b8858c /include/asm-arm
parent98aa686494f92e881869f76bfb734cbb1f53cb13 (diff)
parente7032700a277bf8e263086be94c8b791a668f694 (diff)
parent008f6d2a2817b4a36d477fe969840bb0ef1351a8 (diff)
Merge branches 'at91-fixes' and 'pxa-fixes'