Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Dec 2010 18:25:02 +0000 (10:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Dec 2010 18:25:02 +0000 (10:25 -0800)
commit4e838c7e6ebaf7b2febaafe2cd598a44fdceb094
tree396769da9be766ecbae82c2791bbbc733a5a444b
parentbbbcde9d9614683fbeb41f00728cfbfb7f75a7ad
parentff5dd32b997a5a5ce3f4256257991133d694da0b
Merge branch 'upstream-linus' of git://git./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