Matt Fleming a614e1923d Merge tag 'v3.9' into efi-for-tip2 ...

Resolve conflicts for Ingo.

Conflicts:
	drivers/firmware/Kconfig
	drivers/firmware/efivars.c

Signed-off-by: Matt Fleming <matt.fleming@intel.com>

2013-04-30 11:42:13 +01:00

..

gsmi.c

Merge tag 'v3.9' into efi-for-tip2

2013-04-30 11:42:13 +01:00

Kconfig

firmware: fix GOOGLE_SMI kconfig dependency warning

2011-06-07 10:01:16 -07:00

Makefile

…

memconsole.c

…