From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Nov 2010 01:17:09 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=80ef913f5e6a84551545016cea709f5e96d0cda6;p=openwrt%2Fstaging%2Fblogic.git

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:
  drivers/ata/pata_octeon_cf.c: delete double assignment
  pata_legacy: fix CONFIG_PATA_WINBOND_VLB_MODULE test
  libata: fix NULL sdev dereference race in atapi_qc_complete()
---

80ef913f5e6a84551545016cea709f5e96d0cda6