Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 21 Oct 2006 20:41:41 +0000 (13:41 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 21 Oct 2006 20:41:41 +0000 (13:41 -0700)
commitcb7fabcf9d4340b61f012cc7e8e3d7ff5c4f441c
treef8ffc30b8d1210237051408f71ef2b1dcbb4c0c1
parentdcf234f3b0cbc4d2b73f5ee02405b117c5d77fbd
parent8eb166bf805cc1c1d38d57211e8737631376b9ba
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] libata-sff: Allow for wacky systems
  [PATCH] ahci: readability tweak
  [PATCH] libata: typo fix
  [PATCH] ATA must depend on BLOCK
  [PATCH] libata: use correct map_db values for ICH8