Merge tag 'v3.9' into efi-for-tip2
authorMatt Fleming <matt.fleming@intel.com>
Tue, 30 Apr 2013 10:30:24 +0000 (11:30 +0100)
committerMatt Fleming <matt.fleming@intel.com>
Tue, 30 Apr 2013 10:42:13 +0000 (11:42 +0100)
commita614e1923d5389d01f3545ee4a90e39a04d0c90d
treee8e32dba12a66ffd26d78f015a142ac28e19ad8e
parentf53f292eeaa234615c31a1306babe703fc4263f2
parentc1be5a5b1b355d40e6cf79cc979eb66dafa24ad1
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>
MAINTAINERS
arch/ia64/Kconfig
arch/x86/platform/efi/efi.c
drivers/firmware/efi/efi-pstore.c
drivers/firmware/efi/efi.c
drivers/firmware/efi/efivars.c
drivers/firmware/efi/vars.c
drivers/firmware/google/gsmi.c
fs/efivarfs/super.c
include/linux/efi.h