Matt Fleming a614e1923d 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

Merge tag 'tty-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2012-12-11 14:08:47 -08:00

efi

Merge tag 'v3.9' into efi-for-tip2

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