Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse source

...

This commit is contained in:

David S. Miller 2005-12-14 16:21:48 -08:00

parent 1542272a60 c7868048a7

commit 28247644cc

5 changed files with 20 additions and 5 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

2

arch/arm/kernel/module.c

View file

9

arch/arm/mach-pxa/pm.c

View file

2

arch/ia64/kernel/process.c

View file

10

drivers/mmc/mmc.c

View file

2

include/asm-arm/elf.h

View file