diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 15:29:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 15:29:33 -0700 |
| commit | fd2f261053b2f125d5f6882b6d095ce2f4076fe5 (patch) | |
| tree | 5be548353e3c8b3a7e1e5e01e41b88777ad6d249 /drivers/net/sunbmac.h | |
| parent | 99e1221d1a1edac316f7f8116c781f75733b1159 (diff) | |
| parent | a07a5b336f699e21d405764931a9d5426dc4f945 (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] Fix broken logic, SIGA flags must be bitwise ORed
[S390] cio: Dont print trailing \0 in modalias_show().
[S390] Simplify stack trace.
[S390] z/VM unit record device driver
[S390] vmcp cleanup
[S390] qdio: output queue stall on FCP and network devices
[S390] Fix disassembly of RX_URRD, SI_URD & PC-relative instructions.
[S390] Update default configuration.
Diffstat (limited to 'drivers/net/sunbmac.h')
0 files changed, 0 insertions, 0 deletions