From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 20 Jun 2006 22:38:12 +0000 (-0700)
Subject: Merge branch 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
X-Git-Tag: v2.6.18-rc1~1101
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=077e98945db7e54a9865b5f29a1f02f531eca414;p=linux-2.6

Merge branch 'rio.b19' of git://git.kernel.org/pub/scm/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
---

077e98945db7e54a9865b5f29a1f02f531eca414