From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Aug 2010 01:06:15 +0000 (-0700)
Subject: Merge branch 'stable/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad... 
X-Git-Tag: v2.6.36-rc1~23
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=5e8530810805858892959b8ebbcec1009ea8c12d;hp=-c

Merge branch 'stable/fixes' of git://git./linux/kernel/git/konrad/ibft-2.6

* 'stable/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6:
  firmware: ibft depends on SCSI
  ibft: Kernel oops when rmmoding iscsi_ibft with no iBFT present.
---

5e8530810805858892959b8ebbcec1009ea8c12d