Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 17 Mar 2007 02:28:33 +0000 (19:28 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 17 Mar 2007 02:28:33 +0000 (19:28 -0700)
commitc334ba9e11849f0f23254d82a3305f6174cfbd95
tree3a5ab19da9cea03165a6b6d889ef28cd12437e13
parent47455911674d65fba28d43f4135c28ee40c75bac
parentd1acb4210aaa9bdc413d276dbc96d0a23ada97ba
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Get DEBUG_PAGEALLOC working again.