summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/delay.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-18 15:20:21 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-18 15:20:21 +0100
commit7f9c7e28119cf21ae1a035240da3705647d0d06a (patch)
treec0a1568e21c5ce6cd4112e44071040a3e611a9ec /arch/arm/include/asm/delay.h
parent4af8f24d99d119ed68b27d1b0bd6f2ab2b23ed1b (diff)
parentb476ef059ec9e49d4f2a4280b862b446ef3866e8 (diff)
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/include/asm/delay.h')
0 files changed, 0 insertions, 0 deletions