[GIT PULL] EFI merge botch fix

From: Matt Fleming
Date: Mon Apr 29 2013 - 14:18:27 EST

Hi folks,

This commit fixes the merge botch I created when merging -rc8 into
tip/x86/efi, where I dropped the "select UCS2_STRING" string from
drivers/firmware/Kconfig. The string actually needs to be moved to
arch/ia64 because parts of the core EFI support in drivers/firmware/efi/
require the ucs2 string functions.

The following changes since commit e29c2de5f591490fd51225081e5d7579c6699247:

Merge tag 'v3.9-rc8' into efi-for-tip (2013-04-22 12:53:22 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git efi-for-tip

for you to fetch changes up to da74caa6cead3f6c55dabcaa7b397b2fddd655e3:

ia64, efi: select UCS2_STRING when building EFI support (2013-04-29 14:46:15 +0100)

Matt Fleming (1):
ia64, efi: select UCS2_STRING when building EFI support

arch/ia64/Kconfig | 1 +
1 file changed, 1 insertion(+)

Matt Fleming, Intel Open Source Technology Center
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/