tree 4495364581afd49596e88882f58a2f1196bc512f
parent a8dcf12f9e8ba113251c04d602f1695d537fb142
parent bc4c4f45acbe1f1528d654b0b1793f25c175bf8f
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1184808470 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1184808470 -0700

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