Merge branch 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
commit077e98945db7e54a9865b5f29a1f02f531eca414
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Jun 2006 22:38:12 +0000 (20 15:38 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Jun 2006 22:38:12 +0000 (20 15:38 -0700)
treebb24d180075a2d5ac35bd0d893bdc867405bee03
parentd9eaec9e295a84a80b663996d0489fcff3a1dca9
parent92af11cdec410f5de4e8d702d24e1672ce26a1f6
Merge branch 'rio.b19' of git://git./linux/kernel/git/viro/bird

* 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird:
  [PATCH] missing readb/readw in rio
  [PATCH] copy_to_user() from iomem is a bad thing
  [PATCH] forgotten swap of copyout() arguments
  [PATCH] handling rio MEMDUMP
  [PATCH] fix rio_copy_to_card() for OLDPCI case
  [PATCH] uses of ->Copy() in rioroute are bogus
  [PATCH] bogus order of copy_from_user() arguments
  [PATCH] rio ->Copy() expects the sourse as first argument
  [PATCH] trivial annotations in rio