]> err.no Git - linux-2.6/commitdiff
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)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Mark __ex_table section correctly.


Trivial merge