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

Browse source

...

This commit is contained in:

Linus Torvalds 2005-11-15 12:46:57 -08:00

parent 7ae8c5ec12 72724382d3

commit 47227d50c4

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

18

arch/arm/Kconfig

View file

2

arch/arm/common/sa1111.c

View file