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

Browse source

...

This commit is contained in:

Linus Torvalds 2006-01-17 17:19:53 -08:00

parent c6b3feaf57 4f3f2f6f3e

commit 8f28afac34

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

13

arch/sparc/mm/iommu.c

View file

22

arch/sparc64/kernel/time.c

View file

9

drivers/video/sbuslib.c

View file

2

drivers/video/sbuslib.h

View file

3

sound/sparc/cs4231.c

View file