Linux 3.0.69

Conflicts:

	drivers/firmware/dmi_scan.c

Change-Id: Iab1985723262ecb197058489630fd72781852aac
Signed-off-by: Matt Filetto <matt.filetto@gmail.com>