Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 20 Apr 2007 00:25:28 +0000 (17:25 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 20 Apr 2007 00:25:28 +0000 (17:25 -0700)
commit2b858bd02ffca71391161f5709588fc70da79531
tree5652cdcc7c5307d4ebf2eb029e542b731a7243e5
parent93cd791e02bbdb504aba024a14fdc07fe246bc71
parentf3769e9db11df38c211881a5f11b2e38a8e4477a
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:
  pata_sis: Fix oops on boot