Pekka Enberg 08afe22c68 Merge branch 'slab/next' into slab/for-linus ... Fix up a trivial merge conflict with commit baaf1dd ("mm/slob: use min_t() to compare ARCH_SLAB_MINALIGN") that did not go through the slab tree. Conflicts: mm/slob.c Signed-off-by: Pekka Enberg <penberg@kernel.org>		2012-12-18 12:46:20 +02:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-10-08 07:14:06 +09:00
asm-generic	UAPI: Remove empty non-UAPI Kbuild files	2012-10-17 12:31:15 +01:00
clocksource
crypto	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
drm	drm/radeon: add new SI pci id	2012-11-21 18:37:38 -05:00
keys	KEYS: Asymmetric key pluggable data parsers	2012-10-08 13:50:13 +10:30
linux	Merge branch 'slab/next' into slab/for-linus	2012-12-18 12:46:20 +02:00
math-emu
media	[media] adv7604: Replace prim_mode by mode	2012-11-21 17:43:49 -02:00
memory
misc
net	tcp: bug fix Fast Open client retransmission	2012-12-07 14:39:28 -05:00
pcmcia
ras
rdma	infiniband: pass rdma_cm module to netlink_dump_start	2012-10-07 00:30:56 -04:00
rxrpc
scsi	[SCSI] sd: Implement support for WRITE SAME	2012-11-13 22:45:42 -08:00
sound	ALSA: Add a reference counter to card instance	2012-10-30 11:07:10 +01:00
target	target: Add target_submit_cmd_map_sgls for SGL fabric memory passthrough	2012-10-02 14:16:08 -07:00
trace	Revert "revert "Revert "mm: remove __GFP_NO_KSWAPD""" and associated damage	2012-12-10 11:03:05 -08:00
uapi	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-12-01 13:07:48 -08:00
video	fbdev updates for 3.7	2012-10-12 10:21:02 +09:00
xen	Bug-fixes:	2012-11-10 06:56:21 +01:00
Kbuild	UAPI: Remove empty non-UAPI Kbuild files	2012-10-17 12:31:15 +01:00