Pekka Enberg 23910c50cc Merge branch 'slub/cleanups' into slab/next ...

* Fix a merge conflict in mm/slub.c::acquire_slab() due to commit 02d7633
  ("slub: fix a memory leak in get_partial_node()").

Conflicts:
	mm/slub.c

Signed-off-by: Pekka Enberg <penberg@kernel.org>

2012-06-04 10:14:58 +03:00

..

acpi

…

asm-generic

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-06-01 10:34:35 -07:00

crypto

…

drm

introduce SIZE_MAX

2012-05-31 17:49:26 -07:00

keys

…

linux

Merge branch 'slub/cleanups' into slab/next

2012-06-04 10:14:58 +03:00

math-emu

…

media

[media] patch for Asus My Cinema PS3-100 (1043:48cd)

2012-05-20 16:05:02 -03:00

memory

…

misc

…

mtd

UBI: amend commentaries WRT dtype

2012-05-20 20:25:59 +03:00

net

cipso: handle CIPSO options correctly when NetLabel is disabled

2012-06-01 14:18:29 -04: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

Merge tag 'asoc-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

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

Merge tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linux-2.6

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

…