diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-04 09:45:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-04 09:45:31 -0700 |
| commit | 59107c6525c0d325649eae807905d34772d5a664 (patch) | |
| tree | 098f40e08125695a1dca3ca7a2974fc2d4f71fad /drivers/net/e100.c | |
| parent | 746a99a5af60ee676afa2ba469ccd1373493c7e7 (diff) | |
| parent | ab0fd1debe730ec9998678a0c53caefbd121ed10 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: don't merge requests of different failfast settings
cciss: Ignore stale commands after reboot
Diffstat (limited to 'drivers/net/e100.c')
0 files changed, 0 insertions, 0 deletions