David S. Miller aee289baaa Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	net/ipv6/route.c

Pull in 'net' again to get the revert of Thomas's change
which introduced regressions.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-06-16 01:23:04 -07: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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-06-15 15:51:55 -07: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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-06-16 01:23:04 -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

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

…