You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 4fbef95af4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/usb/qmi_wwan.c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h include/net/netfilter/nf_conntrack_synproxy.h include/net/secure_seq.h The conflicts are of two varieties: 1) Conflicts with Joe Perches's 'extern' removal from header file function declarations. Usually it's an argument signature change or a function being added/removed. The resolutions are trivial. 2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds a new value, another changes an existing value. That sort of thing. Signed-off-by: David S. Miller <davem@davemloft.net>		12 years ago
..
acpi	…
asm-generic	include/asm-generic/vtime.h: avoid zero-length file	12 years ago
clocksource	ARM: SoC cleanups for 3.12	12 years ago
crypto	…
drm	Revert "drm: mark context support as a legacy subsystem"	12 years ago
dt-bindings	Device tree core updates for v3.12	12 years ago
keys	…
kvm	…
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	12 years ago
math-emu	…
media	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	12 years ago
memory	…
misc	…
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	12 years ago
pcmcia	…
ras	…
rdma	Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next	12 years ago
rxrpc	…
scsi	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	12 years ago
sound	sound fixes for 3.12-rc1	12 years ago
target	target/iscsi: Bump versions to v4.1.0	12 years ago
trace	Merge branch 'for-3.12/core' of git://git.kernel.dk/linux-block	12 years ago
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	12 years ago
video	fbdev changes for 3.12:	12 years ago
xen	Features:	12 years ago
Kbuild	…