David S. Miller 6bb8824732 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... net/ipv6/ip6_gre.c is a case of parallel adds. include/trace/events/tcp.h is a little bit more tricky. The removal of in-trace-macro ifdefs in 'net' paralleled with moving show_tcp_state_name and friends over to include/trace/events/sock.h in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-29 15:42:26 -05:00
..
arc
arm	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
ata	Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata	2017-11-15 14:11:41 -08:00
auxdisplay
board
bus	ARM: Device-tree updates for 4.15	2017-11-16 15:48:26 -08:00
c6x
clock	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
cpufreq
cris
crypto	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
devfreq	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
display	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
dma	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
edac
eeprom	dt-bindings: eeprom: at25: Document device-specific compatible values	2017-12-06 15:11:43 -06:00
extcon
firmware	ARM: SoC driver updates for v4.15	2017-11-16 16:05:01 -08:00
fpga
fsi
fuse
goldfish
gpio	DeviceTree fixes for v4.15 (part2):	2017-12-08 13:00:51 -08:00
gpu
h8300
hsi
hwlock
hwmon	hwmon: (jc42) optionally try to disable the SMBUS timeout	2017-11-30 13:12:44 -08:00
i2c	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
iio	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
infiniband
input	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
interrupt-controller	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
iommu	dt-bindings: Remove leading zeros from bindings notation	2017-11-09 17:05:05 -06:00
ipmi
leds	DeviceTree for 4.15:	2017-11-14 18:25:40 -08:00
lpddr2
mailbox	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
media	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
memory-controllers	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
metag
mfd	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
mips
misc	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
mmc	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
mtd	Revert "dt-bindings: mtd: add sst25wf040b and en25s64 to sip-nor list"	2017-12-12 19:35:42 +01:00
mux
net	dt-bindings: net: add DT bindings for Socionext UniPhier AVE	2017-12-28 12:10:39 -05:00
nios2	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
nvmem	Char/Misc patches for 4.15-rc1	2017-11-16 09:10:59 -08:00
openrisc/opencores	dt-bindings: openrisc: Add OpenRISC platform SoC	2017-11-03 14:01:04 +09:00
opp
pci	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
perf
phy	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
pinctrl	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
power	ARM: SoC driver updates for v4.15	2017-11-16 16:05:01 -08:00
powerpc	dt-bindings: Remove leading zeros from bindings notation	2017-11-09 17:05:05 -06:00
pps
ptp
pwm	pwm: Changes for v4.15-rc1	2017-11-22 21:09:18 -10:00
regmap
regulator	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
remoteproc	remoteproc: qcom: Add support for mss remoteproc on msm8996	2017-10-30 18:37:23 -07:00
reserved-memory	dt-binding: soc: qcom: Add binding for rmtfs memory	2017-10-22 05:06:34 -05:00
reset	ARM: SoC driver updates for v4.15	2017-11-16 16:05:01 -08:00
riscv
rng	dt-bindings: rng: Document BCM7278 RNG200 compatible	2017-11-10 19:20:08 +08:00
rtc	RTC for 4.15	2017-11-22 20:58:23 -10:00
scsi
security/tpm
serial	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
serio	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
soc	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
sound	Merge remote-tracking branches 'asoc/fix/adsp', 'asoc/fix/amd', 'asoc/fix/atmel', 'asoc/fix/da7218', 'asoc/fix/da7219', 'asoc/fix/fsl-asrc' and 'asoc/fix/fsl-ssi' into asoc-linus	2017-12-20 15:43:06 +00:00
spi	Merge remote-tracking branches 'spi/fix/armada', 'spi/fix/atmel', 'spi/fix/doc', 'spi/fix/imx', 'spi/fix/rspi', 'spi/fix/sun4i' and 'spi/fix/xilinx' into spi-linus	2017-12-19 11:07:00 +00:00
spmi
sram	dt-bindings: Remove leading zeros from bindings notation	2017-11-09 17:05:05 -06:00
staging/iio/adc
thermal	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
timer	DeviceTree for 4.15:	2017-11-14 18:25:40 -08:00
ufs	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
usb	ARM: SoC fixes for 4.15-rc	2017-12-10 08:26:59 -08:00
virtio
w1
watchdog	dt-bindings: Remove leading 0x from bindings notation	2017-12-06 14:56:33 -06:00
x86
xillybus
ABI.txt
chosen.txt
common-properties.txt
graph.txt
marvell.txt	dt-bindings: Remove leading zeros from bindings notation	2017-11-09 17:05:05 -06:00
numa.txt
property-units.txt
resource-names.txt
sparc_sun_oracle_rng.txt
submitting-patches.txt
trivial-devices.txt	RTC for 4.15	2017-11-22 20:58:23 -10:00
unittest.txt
vendor-prefixes.txt	ARM: Device-tree updates for 4.15	2017-11-16 15:48:26 -08:00
xilinx.txt