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

Browse source

...

This commit is contained in:

Linus Torvalds 2005-06-13 14:47:47 -07:00

parent 980802e311 a8fa3f0c59

commit 386bfcf5e8

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

4

arch/arm/mach-pxa/pxa25x.c

View file

4

arch/arm/mach-pxa/pxa27x.c

View file