diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-27 21:25:02 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-27 21:25:02 +0300 |
| commit | 4e838c7e6ebaf7b2febaafe2cd598a44fdceb094 (patch) | |
| tree | 396769da9be766ecbae82c2791bbbc733a5a444b /drivers/video | |
| parent | bbbcde9d9614683fbeb41f00728cfbfb7f75a7ad (diff) | |
| parent | ff5dd32b997a5a5ce3f4256257991133d694da0b (diff) | |
| download | linux-4e838c7e6ebaf7b2febaafe2cd598a44fdceb094.tar.xz | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_cs5536: avoid implicit MSR API inclusion on x86-64
Diffstat (limited to 'drivers/video')
0 files changed, 0 insertions, 0 deletions