diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-28 11:38:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-28 11:38:39 -0700 |
| commit | 2da6dc28867b6cad6181291ed03093a487587d61 (patch) | |
| tree | b69255137267b8ac217705d2c19eb30ff2cdfc0d /drivers/atm/nicstarmac.c | |
| parent | 0c6cb974636dd29681b03f8eb0ae227decab01fb (diff) | |
| parent | 3c9da7ba049d11caccc219576a3a23404aa2fc50 (diff) | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] cio: Make ccw_device_register() static.
[S390] Improve AP bus device removal.
[S390] uaccess error handling.
[S390] cio: css_probe_device() must be called enabled.
[S390] Initialize interval value to 0.
[S390] sys_getcpu compat wrapper.
Diffstat (limited to 'drivers/atm/nicstarmac.c')
0 files changed, 0 insertions, 0 deletions