]> err.no Git - linux-2.6/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 13 Oct 2006 15:14:41 +0000 (08:14 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 13 Oct 2006 15:14:41 +0000 (08:14 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6:
  [VOYAGER] fix up ptregs removal mess
  [VOYAGER] fix up attribute packed specifiers in voyager.h
  [VOYAGER] fix genirq mess


Trivial merge