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
keys
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
misc
mtd
net	route: Remove redirect_genid	2012-03-08 00:30:32 -08:00
pcmcia
rdma
rxrpc
scsi
sound
target
trace	sched/events: Revert trace_sched_stat_sleeptime()	2012-02-22 12:06:55 +01:00
video
xen
Kbuild