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

Browse source

...

This commit is contained in:

Linus Torvalds 2005-06-16 13:40:39 -07:00

parent 043cf3fd20 22f11c4e66

commit 97008082ea

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

30

arch/arm/mach-pxa/lubbock.c

View file

31

arch/arm/mach-pxa/mainstone.c

View file