Florian Tobias Schandinat d9053b4879 Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next ... Conflicts: drivers/video/omap2/dss/core.c drivers/video/omap2/dss/dispc.c		2012-07-25 08:55:46 +00:00
..
acpi	ACPI: fix acpi_bus.h build warnings when ACPI is not enabled	2012-06-04 00:29:11 -04:00
asm-generic	Merge branches 'sh/urgent', 'sh/core', 'sh/clockevents', 'sh/asm-generic' and 'sh/trivial' into sh-fixes-for-linus	2012-06-13 12:01:33 +09:00
crypto
drm	drm: increase DRM_OBJECT_MAX_PROPERTY to 24	2012-06-12 15:36:31 +01:00
keys	KEYS: Permit in-place link replacement in keyring list	2012-05-11 10:56:56 +01:00
linux	swap: fix shmem swapping when more than 8 areas	2012-06-15 21:48:14 -07: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	bonding: Fix corrupted queue_mapping	2012-06-12 15:29:21 -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] fcoe, bnx2fc, libfcoe: SW FCoE and bnx2fc use FCoE Syfs	2012-05-23 09:43:13 +01:00
sound	ASoC: Last minute updates	2012-05-22 02:58:55 +02: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	Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next	2012-07-25 08:55:46 +00:00
xen	xen: do not map the same GSI twice in PVHVM guests.	2012-05-21 14:11:36 -04:00
Kbuild