Merge remote-tracking branch 'staging/staging-next'

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/board/Kconfig
index 0000000000000000000000000000000000000000,09d94b48c9c9905dbc02b54fe09db225181cedc9..7eda0b8b7aab36e187fb03b539cb597276d3da43
mode 000000,100644..100644
--- /dev/null
--- 2/drivers/staging/board/Kconfig
+++ b/drivers/staging/board/Kconfig
@@@ -1,0 -1,8 +1,9 @@@
+ config STAGING_BOARD
+       boolean "Staging Board Support"
+       depends on OF_ADDRESS
++      depends on BROKEN
+       help
+         Select to enable per-board staging support code.
+ 
+         If in doubt, say N here.
+