summaryrefslogtreecommitdiff
path: root/include/asm-arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-04-24 21:57:45 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-04-24 21:57:45 +0100
commitdf146fa89dd229db487836e5bc07f409999c4687 (patch)
treef1cdb01dceee145e3d59cb577c7af3acab204926 /include/asm-arm
parentef2fc2c7ff6c9257908f18c282b152c25e071949 (diff)
parent4a1fd556c1f1fbd6d9d6739efec042324732b697 (diff)
parente12177073f28419f1f7eb8dbb93aab6b712c7c04 (diff)
parent7fe96f9aabe506c011c3f3ea5b702b14e0129040 (diff)
Merge branches 'dyntick', 'fixes', 'pxa' and 'rpc' into devel