Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 12 Apr 2006 22:25:12 +0000 (15:25 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 12 Apr 2006 22:25:12 +0000 (15:25 -0700)
commit646e120ffe885d70c75460f515d56a5c0d72002e
tree394872f7d8586e2ef320e0a0c6cee0cb3a03ba44
parent2e9f0e18678ffb2a932390e12de88b2b31c465b6
parentd220c37e0a3c9a47ae00e87e044d963b3ea040bc
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] sata_mv: properly print HC registers