Revert "mmc: block: reduce the block timeout to 30 secs"

This reverts commit 9de653e499abd536a89e119c6e84bf08d2777579.
Revert "mmc: core: Fix some driver hangs when dealing with broken devices"

This reverts commit b4046456a04c2e621decff40249b75b856c31285.

Conflicts:
	drivers/mmc/core/core.c

Change-Id: I0093d36d2790eab04afffc47098d73c25d971ea8
Merge tag 'v3.4.73' into cm-11.0-aeroevan

This is the 3.4.73 stable release

Conflicts:
	drivers/md/dm-crypt.c

Change-Id: I84a970b1cbd35025290427c42e9d426bd3b3960d
Merge remote-tracking branch 'aeroevan/cm-11.0-aeroevan' into HEAD