Revert "Revert "Revert "Revert "Fixes for Linaro 4.7 Toolchain - From Solid Kernel""""

This reverts commit 98f34366497f98945c4cba6f25caae2590efefd7.
Revert "Revert "Revert "Revert "Revert "block: Add/Delete IO Schedulers"""""

This reverts commit e93993cb8eab3eb2661ad9257d71be14b8545dea.
block: Re add/delete IO Scedulers