Len Brown ec612fcf43 Merge branch 'd3' into release ...

Conflicts:
	drivers/acpi/sleep.c

This was a text conflict between
a2ef5c4fd4
(ACPI: Move module parameter gts and bfs to sleep.c)

which added #include <linux/module.h>

and

b24e509885
(ACPI, PCI: Move acpi_dev_run_wake() to ACPI core)

which added #include <linux/pm_runtime.h>

The resolution was to take them both.

Signed-off-by: Len Brown <len.brown@intel.com>

2012-03-30 16:21:26 -04:00

..

acpi

Merge branch 'd3' into release

2012-03-30 16:21:26 -04:00

asm-generic

[PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping functions conditional

2012-02-27 09:43:30 -06:00

crypto

…

drm

drm/exynos: exynos_drm.h header file fixes

2012-02-15 10:29:12 +09:00

keys

keys: add a "logon" key type

2012-01-17 22:39:40 -06:00

linux

Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug', 'misc', 'red-hat-bz-727865', 'thermal', 'throttling', 'turbostat' and 'video' into release

2012-03-30 16:10:37 -04:00

math-emu

…

media

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-01-18 12:53:54 -08:00

misc

…

mtd

…

net

route: Remove redirect_genid

2012-03-08 00:30:32 -08:00

pcmcia

…

rdma

…

rxrpc

…

scsi

[SCSI] libfc: Declare local functions static

2012-01-16 12:45:48 +04:00

sound

Merge branch 'fix/asoc' into for-linus

2012-01-31 15:13:14 +01:00

target

target: Change target_submit_cmd() to return void

2012-02-07 06:41:04 +00:00

trace

sched/events: Revert trace_sched_stat_sleeptime()

2012-02-22 12:06:55 +01:00

video

Merge tag 'fbdev-fixes-for-3.3-1' of git://github.com/schandinat/linux-2.6

2012-02-07 15:54:02 -08:00

xen

Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block

2012-01-15 12:48:41 -08:00

Kbuild

…