From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 19 Jul 2007 01:27:50 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/uio-2.6
X-Git-Tag: v2.6.23-rc1~481
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fc15bc817eecd5c13581adab2a182c07edededa0;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/uio-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/uio-2.6:
  UIO: Hilscher CIF card driver
  UIO: Documentation
  UIO: Add the User IO core code
---

fc15bc817eecd5c13581adab2a182c07edededa0