diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-08 07:33:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-08 07:33:46 -0800 |
| commit | 3c443cbc1dbb9a3b4dd9a134b97349195bcb4990 (patch) | |
| tree | 208594c4867cbdfa1616a6f6961334718c0e2c76 /include/linux/ncp_fs.h | |
| parent | d4014030d2b2508aaf54093a5885f1c8a2275dd7 (diff) | |
| parent | 1ffaa640c6ba135aafc91841204e41846eae6841 (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] smsgiucv_app: deliver z/VM CP special messages (SMSG) as uevents
[S390] smsgiucv: declare char pointers as "const"
[S390] dasd: automatic recognition of read-only devices
[S390] remove unused qdio flags in zfcp and qeth
[S390] Cleanup xtime usage
[S390] qdio: add missing bracket
[S390] cio: fix init_count in case of recognition after steal lock
[S390] dasd: security and PSF update patch for EMC CKD ioctl
[S390] hvc_iucv: allocate memory buffers for IUCV in zone DMA
[S390] uaccess: make sure copy_from_user_overflow is builtin
Diffstat (limited to 'include/linux/ncp_fs.h')
0 files changed, 0 insertions, 0 deletions