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

Browse source

...

This commit is contained in:

Linus Torvalds 2005-09-24 13:49:01 -07:00

parent ff13f98b97 d2f607484f

commit f50c02831d

2 changed files with 6 additions and 6 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

6

arch/arm/kernel/io.c

View file

6

include/asm-arm/io.h

View file