Thomas Gleixner e8b9dd7e24 Merge branch 'timers/urgent' into timers/core ... Reason: Update to upstream changes to avoid further conflicts. Fixup a trivial merge conflict in kernel/time/tick-sched.c Signed-off-by: Thomas Gleixner <tglx@linutronix.de>		2012-07-15 10:24:53 +02:00
..
acpi	ACPI: fix acpi_bus.h build warnings when ACPI is not enabled	2012-06-04 00:29:11 -04:00
asm-generic	bug.h: Fix up CONFIG_BUG=n implicit function declarations.	2012-06-25 10:32:49 -07:00
crypto	…
drm	drm: drop comment about this header being autogenerated.	2012-06-22 11:04:55 +01:00
keys	KEYS: Permit in-place link replacement in keyring list	2012-05-11 10:56:56 +01:00
linux	Merge branch 'timers/urgent' into timers/core	2012-07-15 10:24:53 +02:00
math-emu	…
media	[media] patch for Asus My Cinema PS3-100 (1043:48cd)	2012-05-20 16:05:02 -03:00
memory	ddr: add LPDDR2 data from JESD209-2	2012-05-02 00:04:06 -07:00
misc	…
mtd	UBI: amend commentaries WRT dtype	2012-05-20 20:25:59 +03:00
net	sctp: be more restrictive in transport selection on bundled sacks	2012-06-30 22:44:35 -07:00
pcmcia	…
rdma	Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma', 'qib' and 'raw-qp' into for-linus	2012-05-21 09:00:47 -07:00
rxrpc	…
scsi	[SCSI] libsas: fix taskfile corruption in sas_ata_qc_fill_rtf	2012-07-08 09:49:14 +01:00
sound	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-06-25 14:53:09 -07:00
target	target: Add TFO->put_session() caller for HW fabric session shutdown	2012-06-12 19:33:05 -07:00
trace	rcu: Update RCU_FAST_NO_HZ tracing for lazy callbacks	2012-06-06 20:43:27 -07:00
video	fbdev updates for 3.5	2012-06-01 16:57:51 -07:00
xen	xen: do not map the same GSI twice in PVHVM guests.	2012-05-21 14:11:36 -04:00
Kbuild	…