aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/setup.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-20 09:32:12 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-20 09:32:12 +0000
commit196f020fbbb83d246960548e73a40fd08f3e7866 (patch)
treeaed9fa4c32938a4502eb8971dce18f74f0059162 /arch/arm/include/asm/setup.h
parent6d7ed21d17e640b120b902a314143e5ef4917a70 (diff)
parent7d85d61f6ad6e2d6a14b5c20369bc9569f634855 (diff)
parent516295e5ab4bf986865cfff856d484ec678e3b0b (diff)
parent3de4ade3d696db31d1543dce585ba6296f876612 (diff)
Merge branches 'fixes', 'pgt-next' and 'versatile' into devel