linux-next: manual merge of the staging tree with the target-mergetree

From: Stephen Rothwell
Date: Thu Jul 19 2012 - 00:53:18 EST

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/Kconfig between commit d0146d396bfa ("tcm_vhost: Initial
merge for vhost level target fabric driver") from the target-merge tree
and commit 15a4bc17b7f4 ("Staging: add CSR Wifi "os helper" module") from
the staging tree.

Just context changes. I fixed it up (see below) and can carry the fix as
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/staging/Kconfig
index 67ec9fe,e3402d5..0000000
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -132,6 -132,8 +132,10 @@@ source "drivers/staging/ipack/Kconfig

source "drivers/staging/gdm72xx/Kconfig"

+ source "drivers/staging/csr/Kconfig"
+ source "drivers/staging/omap-thermal/Kconfig"
+source "drivers/vhost/Kconfig.tcm"
endif # STAGING

Attachment: pgp00000.pgp
Description: PGP signature