Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 18 Mar 2007 00:05:16 +0000 (17:05 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 18 Mar 2007 00:05:16 +0000 (17:05 -0700)
commitb720a3be1abd0cb5b9b530c0a1b4044fec4de60e
treedb8cb4d0d3857f955a1d2d2e551aa456e3c141a8
parent2f8dd8505e005df1711722664d12865cc8b3da4d
parentdb2f9f6d916e0e3d8666fa9c23f1b0bc0c954b2a
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Use Kconfig.preempt