tree e8e32dba12a66ffd26d78f015a142ac28e19ad8e
parent f53f292eeaa234615c31a1306babe703fc4263f2
parent c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1
author Matt Fleming <matt.fleming@intel.com> 1367317824 +0100
committer Matt Fleming <matt.fleming@intel.com> 1367318533 +0100
mergetag object c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1
 type commit
 tag v3.9
 tagger Linus Torvalds <torvalds@linux-foundation.org> 1367195769 -0700
 
 Linux 3.9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQEcBAABAgAGBQJRfcB+AAoJEHm+PkMAQRiGmLAH/0bIpdOYylJhRDmVOztXpANP
 jRYYH00UiSIBz8XO463dbbtevT2pB8pIw5TCxBWBi/V5rnJS9X5pvAHyNZBDUvYd
 3BQCQ2cnQ+6stFpi4o6NciZzQShDGMmUxAOD6ejZM35/P2l+ZKrNqBwy3R4oeMuZ
 /WUYZTCfFF3G7qgkHoOwIjM6c34v0tpqLfx4R5CdTnKe0Ow0OGb5ko5+lefD6i9m
 6cd2GFlWeIUvw0FSMLyB+HN6Tkf3JnwrklP+vuLNV+uOq5BLwggGc6A1eS51IuVJ
 e/ZkGTtirz+mZiG5lvqSXHaVEObPsbm32XfVVHp1SiE+TIugDb2uhtEQEv+a43w=
 =UOGY
 -----END PGP SIGNATURE-----

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>