diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 13:25:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 13:25:28 -0800 |
| commit | 70077f2fab35ed3d73631fc47d8c572b560ecabd (patch) | |
| tree | 1e979a5eb60c7063e3bc99f7a762f4cdb0ab4203 /drivers/video/nvidia | |
| parent | 85a5d77abea94c3496f63dc3ba72f5f932daa799 (diff) | |
| parent | 527e1e1879cb10958b7ad4e04b3877abf54df3bd (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] pata_jmicron: build fix
Diffstat (limited to 'drivers/video/nvidia')
0 files changed, 0 insertions, 0 deletions