| commit | 4e838c7e6ebaf7b2febaafe2cd598a44fdceb094 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 27 10:25:02 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 27 10:25:02 2010 -0800 |
| tree | 396769da9be766ecbae82c2791bbbc733a5a444b | |
| parent | bbbcde9d9614683fbeb41f00728cfbfb7f75a7ad [diff] | |
| parent | ff5dd32b997a5a5ce3f4256257991133d694da0b [diff] |
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