Matt Fleming a614e1923d 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>		2013-04-30 11:42:13 +01:00
..
ce4100	TTY/Serial merge for 3.8-rc1	2012-12-11 14:08:47 -08:00
efi	Linux 3.9	2013-04-30 11:42:13 +01:00
geode	arch/x86/platform/geode/net5501.c: change active_low to 0 for LED driver	2012-05-04 14:40:07 -07:00
goldfish	goldfish: platform device for x86	2013-01-21 12:09:19 -08:00
iris	arch/x86/platform/iris/iris.c: register a platform device and a platform driver	2012-12-18 15:02:11 -08:00
mrst	X86: drivers: remove __dev* attributes.	2013-01-03 15:57:04 -08:00
olpc	ACPI: Remove useless type argument of driver .remove() operation	2013-01-26 00:37:24 +01:00
scx200	X86: drivers: remove __dev* attributes.	2013-01-03 15:57:04 -08:00
sfi	x86: Convert a few mistaken __cpuinit annotations to __init	2013-01-24 17:12:19 +01:00
ts5500	x86: Add TS-5500 platform support	2013-01-25 19:40:23 +01:00
uv	Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-02-19 20:12:57 -08:00
visws	x86/apic: Fix typo EIO_ACK -> EOI_ACK and document it	2012-05-18 09:46:07 +02:00
Makefile	x86: Add TS-5500 platform support	2013-01-25 19:40:23 +01:00