Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
commitb50fd73b9d8ee1f999e8d625074872eb8fb88439
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 27 Dec 2007 06:04:34 +0000 (26 22:04 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 27 Dec 2007 06:04:34 +0000 (26 22:04 -0800)
treeb049c506ed1c1ce89f62aff7187d75cfdcd81903
parent49eaaa1a6c950e7a92c4386c199b8ec950f840b9
parentbcea1db16ba1c45ccebb3bfb8441642d1342c4d5
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Implement pci_resource_to_user()