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

Browse source

...

This commit is contained in:

Linus Torvalds 2005-11-08 10:23:00 -08:00

parent be9d122730 da1605465e

commit a52e8381c4

2 changed files with 4 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

2

arch/sparc64/mm/fault.c

View file

3

drivers/sbus/char/openprom.c

View file