summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shark
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-06 09:13:53 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-06 09:13:53 -0700
commitda104a83692cf07434ab3b20bf10093bdbc3f97e (patch)
tree6343600c318c600f0dcdf71406bf7d993823afd4 /arch/arm/mach-shark
parent96e1a87392293cf895ea99ab70758453897c7bbf (diff)
parentdc64bef5439c8e1fafea225054da4d8882c9d10c (diff)
downloadop-kernel-dev-da104a83692cf07434ab3b20bf10093bdbc3f97e.zip
op-kernel-dev-da104a83692cf07434ab3b20bf10093bdbc3f97e.tar.gz
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] Use CONFIG_GENERIC_TIME and define TOD clock source. [PATCH] sysrq: irq change build fix. [S390] irq change build fixes. [S390] cio: 0 is a valid chpid. [S390] monwriter buffer limit. [S390] ap bus poll thread priority.
Diffstat (limited to 'arch/arm/mach-shark')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud