diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 18:27:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 18:27:50 -0700 |
| commit | fc15bc817eecd5c13581adab2a182c07edededa0 (patch) | |
| tree | 4495364581afd49596e88882f58a2f1196bc512f /include/linux/kernel.h | |
| parent | Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux (diff) | |
| parent | UIO: Hilscher CIF card driver (diff) | |
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
Diffstat (limited to 'include/linux/kernel.h')
0 files changed, 0 insertions, 0 deletions