Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/uio-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 19 Jul 2007 01:27:50 +0000 (18:27 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 19 Jul 2007 01:27:50 +0000 (18:27 -0700)
commitfc15bc817eecd5c13581adab2a182c07edededa0
tree4495364581afd49596e88882f58a2f1196bc512f
parenta8dcf12f9e8ba113251c04d602f1695d537fb142
parentbc4c4f45acbe1f1528d654b0b1793f25c175bf8f
Merge /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