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)
commit411fdc1a711665cb4bd13df2a75213153d463375
tree3d228fb3563d2270ae2bcf5272298748017b9b9f
parent7f14daa19ea36b200d237ad3ac5826ae25360461
parent81c06b10bcd4c7e8c88b4b425c55402b1d65fd0e
Merge /pub/scm/linux/kernel/git/jejb/voyager-2.6

* 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