FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-13 21:02:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/drivers
History
Tejun Heo a8fa94e0f2 Merge branch 'master' into driver-core-next-test-merge-rc2 
da9846ae1518 ("kernfs: make kernfs_deactivate() honor KERNFS_LOCKDEP
flag") in driver-core-linus conflicts with kernfs_drain() updates in
driver-core-next.  The former just adds the missing KERNFS_LOCKDEP
checks which are already handled by kernfs_lockdep() checks in
driver-core-next.  The conflict can be resolved by taking code from
driver-core-next.

Conflicts:
	fs/kernfs/dir.c
2014-02-10 19:34:30 -05:00
..
accessibility
…
acpi
Merge branches 'acpi-cleanup' and 'acpi-video'
2014-02-06 23:08:54 +01:00
amba
…
ata
ACPI and power management updates for 3.14-rc1
2014-01-24 15:51:02 -08:00
atm
…
auxdisplay
…
base
sysfs, driver-core: remove unused {sysfs|device}_schedule_callback_owner()
2014-02-07 15:42:41 -08:00
bcma
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-01-30 17:20:32 -08:00
block
Bug-fixes:
2014-02-05 16:01:11 -08:00
bluetooth
…
bus
drivers: bus: fix CCI driver kcalloc call parameters swap
2014-01-31 15:15:13 -08:00
cdrom
Merge branch 'for-3.14/drivers' of git://git.kernel.dk/linux-block
2014-01-30 11:40:10 -08:00
char
fix a kmap leak in virtio_console
2014-02-09 15:21:16 -05:00
clk
The second half of the clock framework pull requeust for 3.14 is
2014-01-28 18:44:53 -08:00
clocksource
clocksource: kona: Add basic use of external clock
2014-01-31 21:04:01 -08:00
connector
…
cpufreq
intel_pstate: Take core C0 time into account for core busy calculation
2014-02-04 21:41:15 +01:00
cpuidle
powerpc/powernv/cpuidle: Back-end cpuidle driver for powernv platform.
2014-01-29 17:02:24 +11:00
crypto
ARM: driver updates for 3.14
2014-01-23 18:49:36 -08:00
dca
…
devfreq
Merge branches 'pm-cpufreq' and 'pm-devfreq'
2014-01-29 11:48:23 +01:00
dio
…
dma
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-01-29 20:27:23 -08:00
edac
…
eisa
…
extcon
…
firewire
…
firmware
firmware/google: drop 'select EFI' to avoid recursive dependency
2014-01-27 21:02:40 -08:00
fmc
…
gpio
ARM: driver updates for 3.14
2014-01-23 18:49:36 -08:00
gpu
Merge branch 'master' into driver-core-next-test-merge-rc2
2014-02-10 19:34:30 -05:00
hid
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2014-01-31 09:31:14 -08:00
hsi
…
hv
hyperv: Add support for physically discontinuous receive buffer
2014-01-27 16:40:45 -08:00
hwmon
hwmon: (da9055) Remove use of regmap_irq_get_virq()
2014-02-06 17:22:33 -08:00
hwspinlock
…
i2c
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-01-29 19:56:20 -08:00
ide
drivers: ide: Include appropriate header file in ide-pio-blacklist.c
2014-01-28 23:35:09 -08:00
idle
ACPI and power management updates for 3.14-rc1
2014-01-24 15:51:02 -08:00
iio
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2014-01-22 21:21:55 -08:00
infiniband
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-01-31 15:31:23 -08:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-01-24 17:17:30 -08:00
iommu
IOMMU Updates for Linux v3.14
2014-01-29 20:00:13 -08:00
ipack
…
irqchip
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-02-05 16:02:53 -08:00
isdn
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
leds
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-01-28 18:53:01 -08:00
lguest
…
macintosh
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2014-01-27 21:11:26 -08:00
mailbox
drivers/mailbox/omap: make mbox->irq signed for error handling
2014-01-23 16:36:53 -08:00
md
Merge branch 'for-3.14/drivers' of git://git.kernel.dk/linux-block
2014-01-30 11:40:10 -08:00
media
Merge branch 'master' into driver-core-next-test-merge-rc2
2014-02-10 19:34:30 -05:00
memory
…
memstick
drivers/memstick/host/rtsx_pci_ms.c: fix ms card data transfer bug
2014-01-23 16:37:04 -08:00
message
Merge branch 'for-3.14/core' of git://git.kernel.dk/linux-block
2014-01-30 11:19:05 -08:00
mfd
regulator: Updates for v3.14
2014-01-25 13:19:10 -08:00
misc
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2014-01-29 18:56:27 -08:00
mmc
MMC highlights for 3.14:
2014-01-26 11:00:41 -08:00
mtd
* Improve the NOR erasure quirk - now it tries to do as little writes as
2014-01-30 20:04:09 -08:00
net
Merge branch 'akpm' (patches from Andrew Morton)
2014-01-30 18:44:44 -08:00
nfc
…
ntb
…
nubus
…
of
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
oprofile
…
parisc
…
parport
…
pci
Merge branch 'master' into driver-core-next-test-merge-rc2
2014-02-10 19:34:30 -05:00
pcmcia
PCI changes for the v3.14 merge window:
2014-01-22 16:39:28 -08:00
phy
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
pinctrl
pinctrl: tegra: return correct error type
2014-02-06 14:21:19 +01:00
platform
platform/chrome: Cleanups and improvements
2014-01-29 20:06:01 -08:00
pnp
…
power
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
powercap
…
pps
…
ps3
…
ptp
…
pwm
pwm: Changes for v3.14-rc1
2014-01-27 08:15:51 -08:00
rapidio
…
regulator
Merge remote-tracking branches 'regulator/fix/ab3100' and 'regulator/fix/s2mps11' into regulator-linus
2014-02-04 12:58:19 +00:00
remoteproc
…
reset
…
rpmsg
…
rtc
Merge branch 'akpm' (incoming from Andrew)
2014-01-23 19:11:50 -08:00
s390
s390: use device_remove_file_self() instead of device_schedule_callback()
2014-02-07 15:42:41 -08:00
sbus
sparc: delete non-required instances of include <linux/init.h>
2014-01-28 23:38:23 -08:00
scsi
scsi: use device_remove_file_self() instead of device_schedule_callback()
2014-02-07 15:42:41 -08:00
sfi
…
sh
…
sn
…
spi
Merge remote-tracking branch 'agust/next' into next
2014-01-29 16:53:55 +11:00
ssb
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-01-30 17:20:32 -08:00
staging
[media] go7007-loader: fix usb_dev leak
2014-02-04 06:28:00 -02:00
target
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-01-31 15:31:23 -08:00
tc
…
thermal
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2014-01-24 17:13:49 -08:00
tty
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-01-30 17:20:32 -08:00
uio
…
usb
Merge remote-tracking branch 'agust/next' into next
2014-01-29 16:53:55 +11:00
uwb
…
vfio
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2014-01-27 21:11:26 -08:00
vhost
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-01-31 15:31:23 -08:00
video
parisc/sti_console: prefer Linux fonts over built-in ROM fonts
2014-02-02 20:56:47 +01:00
virt
…
virtio
A few simple fixes. Quiet cycle.
2014-01-22 22:24:35 -08:00
vlynq
drivers/vlynq/vlynq.c: fix another resource size off by 1 error
2014-01-23 16:36:55 -08:00
vme
…
w1
drivers/w1/masters/w1-gpio.c: add strong pullup emulation
2014-01-23 16:37:04 -08:00
watchdog
watchdog: dw_wdt: Add dependency on HAS_IOMEM
2014-02-08 09:47:11 +01:00
xen
Bug-fixes:
2014-02-05 16:01:11 -08:00
zorro
…
Kconfig
…
Makefile
…