iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
Arnd Bergmann 7135466151 Merge branch 'brcm/stb-smp-uart' into next/drivers 
This resolves a nonobvious merge conflict that I got wrong the
first time.

* brcm/stb-smp-uart:
  bus: brcmstb_gisb: save and restore GISB timeout
  bus: brcmstb_gisb: register the fault code hook
  ARM: brcmstb: Kconfig: drop unneeded symbol selections
  ARM: brcmstb: reintroduce SMP support
  ARM: brcmstb: add debug UART for earlyprintk support

Conflicts:
	drivers/bus/brcmstb_gisb.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reported-by: Florian Fainelli <f.fainelli@gmail.com>
2014-12-08 17:16:26 +01:00
..
accessibility
…
acpi
Merge branches 'acpi-scan' and 'acpi-ec'
2014-10-31 22:24:44 +01:00
amba
ARM: tegra: Move AHB Kconfig to drivers/amba
2014-11-26 09:43:25 +01:00
ata
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-10-18 18:11:04 -07:00
atm
atm: simplify lanai.c by using module_pci_driver
2014-10-17 11:55:32 -04:00
auxdisplay
…
base
ACPI and power management fixes for 3.18-rc3
2014-10-31 19:08:25 -07:00
bcma
bcma: add another PCI ID of device with BCM43228
2014-10-23 14:02:06 -04:00
block
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
2014-10-31 15:00:48 -07:00
bluetooth
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-10-13 11:28:42 +02:00
bus
Merge branch 'brcm/stb-smp-uart' into next/drivers
2014-12-08 17:16:26 +01:00
cdrom
…
char
Return short read or 0 at end of a raw device, not EIO
2014-10-31 06:33:26 -04:00
clk
clk: tegra: Implement memory-controller clock
2014-11-26 09:43:23 +01:00
clocksource
Merge branch 'clocksource/physical-timers' into next/drivers
2014-12-04 23:32:16 -08:00
connector
…
cpufreq
cpufreq: cpufreq-dt: Restore default cpumask_setall(policy->cpus)
2014-10-27 23:27:35 +01:00
cpuidle
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-10-24 12:48:47 -07:00
crypto
crypto: LLVMLinux: Remove VLAIS from crypto/.../qat_algs.c
2014-10-14 10:51:23 +02:00
dca
…
devfreq
PM / devfreq: exynos: Enable building exynos PPMU as module
2014-09-29 20:22:36 +09:00
dio
…
dma
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-10-18 18:11:04 -07:00
dma-buf
dma-buf: don't open-code atomic_long_read()
2014-10-09 02:39:07 -04:00
edac
e7xxx_edac: Report CE events properly
2014-10-22 22:59:00 +02:00
eisa
…
extcon
extcon: gpio: Fix code cleanup
2014-09-22 16:48:47 +09:00
firewire
…
firmware
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-23 14:45:09 -07:00
fmc
…
gpio
This is the bulk of GPIO changes for the v3.18 development
2014-10-09 14:58:15 -04:00
gpu
drm/exynos: correct connector->dpms field before resuming
2014-11-03 01:51:28 +09:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2014-10-29 11:52:35 -07:00
hsi
…
hv
Drivers: hv: vmbus: Enable interrupt driven flow control
2014-09-23 23:31:22 -07:00
hwmon
hwmon: (menf21bmc) Include linux/err.h
2014-10-19 18:41:18 -07:00
hwspinlock
…
i2c
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-10-19 12:50:44 -07:00
ide
Merge branch 'for-3.18/drivers' of git://git.kernel.dk/linux-block
2014-10-18 12:12:45 -07:00
idle
…
iio
First round of IIO fixes for the 3.18 cycle.
2014-10-25 10:09:39 +08:00
infiniband
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-10-31 15:04:58 -07:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-10-31 19:51:11 -07:00
iommu
memory: Add NVIDIA Tegra memory controller support
2014-12-04 16:11:47 +01:00
ipack
ipoctal: clear break interrupt as soon as it occurs
2014-09-23 23:26:42 -07:00
irqchip
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-15 07:48:18 +02:00
isdn
isdn/gigaset: fix usb_gigaset write_cmd result race
2014-10-14 15:05:35 -04:00
leds
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-10-21 08:18:38 -07:00
lguest
…
macintosh
powerpc: Move via-cuda symbol exports next to function definitions
2014-09-25 23:14:37 +10:00
mailbox
Merge branch 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration
2014-10-21 11:21:19 -07:00
mcb
…
md
. fix DM's long-standing excessive use of memory by leveraging the new
2014-10-18 12:25:30 -07:00
media
[media] s5p-jpeg: Avoid -Wuninitialized warning in s5p_jpeg_parse_hdr
2014-10-24 09:36:59 -02:00
memory
memory: Add NVIDIA Tegra memory controller support
2014-12-04 16:11:47 +01:00
memstick
memstick: r592: fix build warnings for !PM_SLEEP
2014-10-14 02:18:22 +02:00
message
SCSI for-linus on 20141007
2014-10-07 21:29:18 -04:00
mfd
Changes to existing drivers:
2014-10-15 06:58:16 +02:00
misc
cxl: Fix PSL error due to duplicate segment table entries
2014-10-28 19:52:52 +11:00
mmc
Merge branch 'for-3.18/drivers' of git://git.kernel.dk/linux-block
2014-10-18 12:12:45 -07:00
mtd
Three main MTD fixes for 3.18:
2014-11-02 14:45:52 -08:00
net
Merge tag 'master-2014-10-30' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2014-10-31 16:18:35 -04:00
nfc
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2014-10-07 14:48:29 -04:00
ntb
ntb: Adding split BAR support for Haswell platforms
2014-10-17 07:08:51 -04:00
nubus
…
of
drivers: of: add return value to of_reserved_mem_device_init()
2014-10-29 16:33:14 -07:00
oprofile
…
parisc
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
parport
parport: parport_pc: Implement architecture and device check to cut off false-positives
2014-09-23 23:14:28 -07:00
pci
PCI updates for v3.18:
2014-10-31 18:48:29 -07:00
pcmcia
…
phy
phy: remove .owner field for drivers using module_platform_driver
2014-09-24 15:18:34 +05:30
pinctrl
This is the bulk of GPIO changes for the v3.18 development
2014-10-09 14:58:15 -04:00
platform
thinkpad_acpi: replace strnicmp with strncasecmp
2014-10-14 02:18:25 +02:00
pnp
PNP: replace strnicmp with strncasecmp
2014-10-14 02:18:25 +02:00
power
power: reset: at91-reset: fix power down register
2014-10-22 10:08:22 +02:00
powercap
…
pps
…
ps3
…
ptp
…
pwm
pwm: Changes for v3.18-rc1
2014-10-21 08:17:43 -07:00
rapidio
…
ras
…
regulator
Merge remote-tracking branch 'regulator/fix/rk808' into regulator-linus
2014-10-27 11:26:24 +00:00
remoteproc
…
reset
Reset controller changes for v3.19
2014-12-04 16:57:36 +01:00
rpmsg
…
rtc
Merge branch 'at91/cleanup' into next/drivers
2014-11-20 14:02:34 +01:00
s390
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2014-10-21 07:47:54 -07:00
sbus
…
scsi
libcxgbi : support ipv6 address host_param
2014-10-28 09:57:00 +01:00
sfi
…
sh
…
sn
…
soc
soc: ti: knav_qmss_queue: Use list_for_each_entry_safe to prevent use after free
2014-11-03 10:22:06 -08:00
spi
Merge remote-tracking branches 'spi/fix/dw', 'spi/fix/orion', 'spi/fix/pl022', 'spi/fix/rockchip' and 'spi/fix/spidev' into spi-linus
2014-10-27 11:26:54 +00:00
spmi
…
ssb
This is the bulk of GPIO changes for the v3.18 development
2014-10-09 14:58:15 -04:00
staging
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-11-02 10:28:43 -08:00
target
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-10-21 13:06:38 -07:00
tc
…
thermal
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2014-10-24 11:21:43 -07:00
thunderbolt
…
tty
serial: samsung: Fix serial config dependencies for exynos7
2014-11-22 00:09:25 +09:00
uio
uio: Export definition of struct uio_device
2014-10-02 21:35:54 -07:00
usb
USB-serial fixes for v3.18-rc3
2014-10-29 09:24:42 -07:00
uwb
uwb: add an ASIE sysfs attribute to uwb_rc devices
2014-09-23 22:05:26 -07:00
vfio
IOMMU Updates for Linux v3.18
2014-10-15 07:23:49 +02:00
vhost
…
video
Merge branch '3.18/omapdss-fixes' into 3.18/fbdev-fixes
2014-10-30 14:53:49 +02:00
virt
…
virtio
One cc: stable commit, the rest are a series of minor cleanups which have
2014-10-18 10:25:09 -07:00
vlynq
…
vme
…
w1
w1: omap-hdq: support device probing with device-tree
2014-11-10 15:58:47 -08:00
watchdog
watchdog: meson: remove magic value for reboot
2014-10-20 21:09:17 +02:00
xen
xen/pci: Allocate memory for physdev_pci_device_add's optarr
2014-10-23 16:24:02 +01:00
zorro
…
Kconfig
ARM: tegra: Move AHB Kconfig to drivers/amba
2014-11-26 09:43:25 +01:00
Makefile
…