Merge branch 'stable/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Aug 2010 01:06:15 +0000 (18:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Aug 2010 01:06:15 +0000 (18:06 -0700)
commit5e8530810805858892959b8ebbcec1009ea8c12d
tree01c08d865f43b51ec6b4201082d5b84218192fe9
parent75a1e32cce30ab1c5a361ebae24a18753e42feaa
parent4cde752587bab61cedf53fc59ca92787f8612ec0
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.