UBUNTU: Start new release

Ignore: yes
Signed-off-by: Brad Figg <brad.figg@canonical.com>
UBUNTU: Revert "drm/i915: GFX_MODE Flush TLB Invalidate Mode must be '1' for scanline waits"

This reverts commit 4c443ec9afe7f6fab41106c617136aca44d69a7b.

This commit has been shown to cause GPU hangs on Sandy Bridge GPUs

BugLink: http://bugs.launchpad.net/bugs/1140716

Acked-by: Brad Figg <brad.figg@canonical.com>
Acked-by: Luis Henriques <luis.henriques@canonical.com>
Signed-off-by: Steve Conklin <sconklin@canonical.com>
fbcon: fix locking harder

BugLink: http://bugs.launchpad.net/bugs/1167114

Okay so Alan's patch handled the case where there was no registered fbcon,
however the other path entered in set_con2fb_map pit.

In there we called fbcon_takeover, but we also took the console lock in a couple
of places. So push the console lock out to the callers of set_con2fb_map,

this means fbmem and switcheroo needed to take the lock around the fb notifier
entry points that lead to this.

This should fix the efifb regression seen by Maarten.

Tested-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Tested-by: Lu Hua <huax.lu@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
(cherry picked from commit 054430e773c9a1e26f38e30156eff02dedfffc17)
UBUNTU: Ubuntu-3.5.0-28.48

Signed-off-by: Brad Figg <brad.figg@canonical.com>