Len Brown d326f44e5f Merge branch 'tboot' into release ... Conflicts: drivers/acpi/acpica/hwsleep.c Text conflict between: 2feec47d4c (ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers) which removed #include "actables.h" and 09f98a825a (x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.) which removed #include <linux/tboot.h> The resolution is to remove them both. Signed-off-by: Len Brown <len.brown@intel.com>		2012-03-30 16:38:59 -04:00
..
acpi	Merge branch 'tboot' into release	2012-03-30 16:38:59 -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 branch 'tboot' into release	2012-03-30 16:38:59 -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	mtd: document that MEMWRITE ioctl is NAND-specific	2012-01-09 18:18:36 +00:00
net	route: Remove redirect_genid	2012-03-08 00:30:32 -08:00
pcmcia
rdma	rdma/core: Fix sparse warnings	2012-01-04 09:17:45 -08:00
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	fbdev fixes for 3.3	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