745
parent 65d76fc4b3161ee1e7034a6f764d1151eb51a555
parent 1f474646fdc36b457606bbcd6a3592e6cbd31ac4
author Linus Torvalds <torvalds@linux-foundation.org> 1266636880 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1266636880 -0800

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Fix sun4u execute bit check in TSB I-TLB load.
  sparc: Fix incorrect comparison in of_bus_ambapp_match()
  sparc64: Sync of_create_pci_dev() with drivers/pci/probe.c changes.
  sparc64: Tighten checks in kstack_valid().

 Ö