Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 5 Mar 2006 18:02:25 +0000 (10:02 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 5 Mar 2006 18:02:25 +0000 (10:02 -0800)
commit5b10b9a787a981259cca213c8bf1c79333c3c67e
treefd6797cb174d7dc9a01bd6fd33c9033949c4887c
parentc09966608da7e8cad3468e925ac9062e44fee831
parent4d000d5b9689734006d89fe9b7597c758b74a9fb
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Mark __ex_table section correctly.