David S. Miller
1459143386
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
...
Conflicts:
drivers/net/ieee802154/fakehard.c
A bug fix went into 'net' for ieee802154/fakehard.c, which is removed
in 'net-next'.
Add build fix into the merge from Stephen Rothwell in openvswitch, the
logging macros take a new initial 'log' argument, a new call was added
in 'net' so when we merge that in here we have to explicitly add the
new 'log' arg to it else the build fails.
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-21 22:28:24 -05:00
..
acpi
ACPI and power management updates for 3.18-rc2
2014-10-24 11:29:31 -07:00
asm-generic
Revert "fast_hash: avoid indirect function calls"
2014-11-14 16:36:25 -05:00
clocksource
crypto
crypto: LLVMLinux: Add macro to remove use of VLAIS in crypto code
2014-10-14 10:51:22 +02:00
drm
drm/radeon: remove invalid pci id
2014-10-28 10:44:36 -04:00
dt-bindings
Few omap fixes for hangs and wrong pinctrl defines, and update
2014-11-16 15:09:53 -08:00
keys
kvm
arm/arm64: KVM: Fix BE accesses to GICv2 EISR and ELRSR regs
2014-10-16 10:57:41 +02:00
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-11-21 22:28:24 -05:00
math-emu
media
memory
misc
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-11-21 22:28:24 -05:00
pcmcia
ras
rdma
rxrpc
scsi
scsi: set REQ_QUEUE for the blk-mq case
2014-10-28 09:53:43 +01:00
soc /tegra
sound
ASoC: dpcm: Fix race between FE/BE updates and trigger
2014-11-04 17:18:32 +00:00
target
trace
Merge branch 'urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/urgent
2014-10-30 07:37:37 +01:00
uapi
Merge tag 'master-2014-11-20' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
2014-11-21 16:39:45 -05:00
video
fbdev changes for 3.18
2014-10-18 18:03:02 -07:00
xen
Kbuild