Merge master.kernel.org:/home/rmk/linux-2.6-arm

Browse source

...

This commit is contained in:

Linus Torvalds 2005-06-16 13:22:23 -07:00

parent c081474c18 95220a2ea3

commit 043cf3fd20

4 changed files with 16 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/arm/mach-integrator/integrator_cp.c

View file

2

arch/arm/mach-versatile/core.c

View file

4

include/asm-arm/arch-integrator/platform.h

View file

16

include/asm-arm/arch-versatile/platform.h

View file