| commit | a614e1923d5389d01f3545ee4a90e39a04d0c90d | [log] [tgz] |
|---|---|---|
| author | Matt Fleming <matt.fleming@intel.com> | Tue Apr 30 11:30:24 2013 +0100 |
| committer | Matt Fleming <matt.fleming@intel.com> | Tue Apr 30 11:42:13 2013 +0100 |
| tree | e8e32dba12a66ffd26d78f015a142ac28e19ad8e | |
| parent | f53f292eeaa234615c31a1306babe703fc4263f2 [diff] [blame] | |
| parent | c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 [diff] [blame] |
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>
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 9a02f71..da18c8e 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig
@@ -110,6 +110,7 @@ config EFI bool + select UCS2_STRING default y config SCHED_OMIT_FRAME_POINTER