Linux 3.4.13
Linux 3.4.14

Conflicts:
	drivers/base/power/main.c

Change-Id: Ie70d59d6f4b49607df2337a709f499b69aff45ca
Merge pull request #4 from rebelos/upstream-3.4

Upstream 3.4