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

Browse source

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Missing #include <linux/mm.h> in drivers/sbus/char/flash.c
  [SPARC32]: Build fix.
  [SPARC64]: Add missing NCS and SVC hypervisor interfaces.

...

This commit is contained in:

Linus Torvalds 2007-05-31 09:14:12 -07:00

parent b9066c268a 8a73709ecc

commit 0e9871df23

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

4

arch/sparc/lib/atomic32.c

View file

72

arch/sparc64/kernel/entry.S

View file

1

drivers/sbus/char/flash.c

View file

168

include/asm-sparc64/hypervisor.h

View file