Jiri Kosina 59f91e5dd0 Merge branch 'master' into for-next ... Conflicts: include/linux/mmzone.h Synced with Linus' tree so that trivial patch can be applied on top of up-to-date code properly. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>		2012-06-29 14:45:58 +02:00
..
acpi	ACPI: Add _PLD support	2012-05-11 17:03:12 -07:00
asm-generic	mm: pmd_read_atomic: fix 32bit PAE pmd walk vs pmd_populate SMP race condition	2012-05-29 16:22:24 -07:00
crypto
drm	ttm: add prime sharing support to TTM (v2)	2012-05-23 10:46:27 +01:00
keys	KEYS: Permit in-place link replacement in keyring list	2012-05-11 10:56:56 +01:00
linux	Merge branch 'master' into for-next	2012-06-29 14:45:58 +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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-24 11:54:29 -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	isci update for 3.5	2012-05-21 12:17:30 +01:00
sound	ASoC: Last minute updates	2012-05-22 02:58:55 +02:00
target	target: Add MI_REPORT_TARGET_PGS ext. header + implict_trans_secs attribute	2012-05-17 00:45:58 -07:00
trace	mm: vmscan: remove reclaim_mode_t	2012-05-29 16:22:19 -07:00
video	arm-soc: First batch of cleanups	2012-05-22 09:23:24 -07:00
xen	xen: do not map the same GSI twice in PVHVM guests.	2012-05-21 14:11:36 -04:00
Kbuild