sugar/linux
1
0
Fork 0
Code Activity
Files
d8d1c35139481ee8e292d91cd3fd35a6b3a316eb
linux/drivers
History
Ingo Molnar d8d1c35139 Merge branch 'x86/mm' into x86/asm to resolve conflict and to create common base 
Conflicts:
	arch/x86/include/asm/cpufeature.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-13 11:36:19 +02:00
..
accessibility
…
acpi
Merge tag 'pm+acpi-4.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2016-03-24 22:59:58 -07:00
amba
…
android
…
ata
Merge branch 'for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2016-03-18 20:06:46 -07:00
atm
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2016-03-17 21:38:27 -07:00
auxdisplay
…
base
Merge tag 'pm+acpi-4.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2016-03-24 22:59:58 -07:00
bcma
…
block
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2016-03-26 15:53:16 -07:00
bluetooth
…
bus
Merge tag 'arm64-perf' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
2016-03-21 13:14:16 -07:00
cdrom
…
char
Revert "ppdev: use new parport device model"
2016-03-25 09:02:13 -07:00
clk
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
2016-03-23 06:06:45 -07:00
clocksource
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-24 10:32:42 -07:00
connector
…
cpufreq
Merge tag 'pm+acpi-4.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2016-03-24 22:59:58 -07:00
cpuidle
cpuidle: menu: Fall back to polling if next timer event is near
2016-03-21 15:50:28 +01:00
crypto
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2016-03-23 06:12:39 -07:00
dca
…
devfreq
PM / devfreq: Spelling s/frequnecy/frequency/
2016-03-17 02:30:16 +01:00
dio
…
dma
Merge tag 'asm-generic-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
2016-03-24 23:13:48 -07:00
dma-buf
dma-buf: Update docs for SYNC ioctl
2016-03-21 09:26:45 +01:00
edac
Merge tag 'edac_for_4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
2016-03-16 08:36:55 -07:00
eisa
…
extcon
…
firewire
Merge tag 'firewire-update2' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
2016-03-25 08:52:25 -07:00
firmware
kernel: add kcov code coverage
2016-03-22 15:36:02 -07:00
fmc
…
fpga
…
gpio
Merge tag 'mfd-for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2016-03-18 10:15:11 -07:00
gpu
Merge branch 'x86/mm' into x86/asm to resolve conflict and to create common base
2016-04-13 11:36:19 +02:00
hid
drivers/hid/uhid.c: check write() bitness using in_compat_syscall
2016-03-22 15:36:02 -07:00
hsi
…
hv
Merge tag 'char-misc-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2016-03-17 13:47:50 -07:00
hwmon
hwmon: (max1111) Return -ENODEV from max1111_read_channel if not instantiated
2016-03-27 10:37:48 -07:00
hwspinlock
…
hwtracing
…
i2c
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2016-03-22 12:47:40 -07:00
ide
ide: palm_bk3710: test clock rate to avoid division by 0
2016-03-20 16:59:27 -04:00
idle
intel_idle: Support for Intel Xeon Phi Processor x200 Product Family
2016-03-23 16:19:38 -04:00
iio
Merge tag 'mfd-for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2016-03-18 10:15:11 -07:00
infiniband
Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2016-03-23 15:57:39 -07:00
input
Merge branch 'akpm' (patches from Andrew)
2016-03-25 16:59:11 -07:00
iommu
Merge tag 'iommu-updates-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2016-03-22 11:57:43 -07:00
ipack
…
irqchip
irqchip/mbigen: Make CONFIG_HISILICON_IRQ_MBIGEN a hidden option
2016-03-23 12:02:29 +01:00
isdn
isdn: Use ktime_t instead of 'struct timeval'
2016-03-20 16:47:13 -04:00
leds
Merge tag 'platform-drivers-x86-v4.6-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
2016-03-23 17:20:59 -07:00
lguest
x86/cpufeature: Remove cpu_has_pge
2016-03-31 13:35:09 +02:00
lightnvm
lightnvm: do not load L2P table if not supported
2016-03-18 18:10:38 -07:00
macintosh
…
mailbox
Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration
2016-03-23 06:09:15 -07:00
mcb
…
md
Merge tag 'md/4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md
2016-03-21 14:18:10 -07:00
media
[media] vsp1: use proper dma alloc/free functions
2016-03-21 13:49:01 -07:00
memory
Merge tag 'for-linus-20160324' of git://git.infradead.org/linux-mtd
2016-03-24 19:57:15 -07:00
memstick
drivers/memstick/host/r592.c: avoid gcc-6 warning
2016-03-25 16:37:42 -07:00
message
…
mfd
Merge tag 'mfd-for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2016-03-18 10:15:11 -07:00
misc
Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-20 19:08:56 -07:00
mmc
Merge tag 'mmc-v4.6' of git://git.linaro.org/people/ulf.hansson/mmc
2016-03-21 14:35:52 -07:00
mtd
Merge tag 'for-linus-20160324' of git://git.infradead.org/linux-mtd
2016-03-24 19:57:15 -07:00
net
Merge tag 'asm-generic-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
2016-03-24 23:13:48 -07:00
nfc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-03-19 10:05:34 -07:00
ntb
NTB: Remove _addr functions from ntb_hw_amd
2016-03-26 11:44:33 -04:00
nubus
…
nvdimm
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2016-03-19 16:31:54 -07:00
nvme
nvme: avoid cqe corruption when update at the same time as read
2016-03-22 10:27:29 -06:00
nvmem
…
of
Merge tag 'devicetree-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
2016-03-19 15:15:07 -07:00
oprofile
…
parisc
Merge tag 'pci-v4.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2016-03-16 14:45:55 -07:00
parport
…
pci
Revert "PCI: dra7xx: Mark driver as broken"
2016-03-22 07:50:11 -05:00
pcmcia
…
perf
drivers/perf: arm_pmu: avoid NULL dereference when not using devicetree
2016-03-21 11:36:17 +00:00
phy
…
pinctrl
Merge branch 'akpm' (patches from Andrew)
2016-03-18 19:26:54 -07:00
platform
Merge tag 'platform-drivers-x86-v4.6-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
2016-03-23 17:20:59 -07:00
pnp
…
power
Merge tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2016-03-25 16:55:37 -07:00
powercap
…
pps
…
ps3
…
ptp
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-15 12:13:56 -07:00
pwm
pwm: omap-dmtimer: Add debug message for effective period and duty cycle
2016-03-23 17:11:48 +01:00
rapidio
rapidio: add mport char device driver
2016-03-22 15:36:02 -07:00
ras
…
regulator
Merge tag 'mfd-for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2016-03-18 10:15:11 -07:00
remoteproc
…
reset
…
rpmsg
…
rtc
Merge tag 'rtc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
2016-03-24 22:49:08 -07:00
s390
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2016-03-20 13:28:18 -07:00
sbus
…
scsi
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2016-03-26 11:31:01 -07:00
sfi
…
sh
…
sn
…
soc
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2016-03-20 15:40:32 -07:00
spi
Merge tag 'dmaengine-4.6-rc1' of git://git.infradead.org/users/vkoul/slave-dma
2016-03-17 12:34:54 -07:00
spmi
…
ssb
…
staging
x86/cpufeature: Remove cpu_has_hypervisor
2016-03-31 13:35:07 +02:00
target
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2016-03-22 12:41:14 -07:00
tc
…
thermal
Thermal: Ignore invalid trip points
2016-03-18 14:10:57 +08:00
thunderbolt
…
tty
Merge tag 'for-linus-4.6-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2016-03-22 12:55:17 -07:00
uio
…
usb
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
2016-03-23 06:06:45 -07:00
uwb
…
vfio
Merge tag 'vfio-v4.6-rc1' of git://github.com/awilliam/linux-vfio
2016-03-17 13:05:09 -07:00
vhost
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2016-03-22 12:41:14 -07:00
video
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
2016-03-23 06:06:45 -07:00
virt
…
virtio
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2016-03-20 13:28:18 -07:00
vlynq
…
vme
…
w1
…
watchdog
hpwdt: use nmi_panic() when kernel panics in NMI handler
2016-03-22 15:36:02 -07:00
xen
Merge tag 'for-linus-4.6-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2016-03-22 12:55:17 -07:00
zorro
…
Kconfig
…
Makefile
…