shinys000114/odroid-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
69c1f05379a34786da96d0fdedc111cdcdecdf6f
odroid-linux/drivers
History
Greg Kroah-Hartman 69c1f05379 Merge 3.15-rc6 into staging-next. 
This resolves the conflicts in the files:
	drivers/iio/adc/Kconfig
	drivers/staging/rtl8723au/os_dep/usb_ops_linux.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-22 23:27:17 +09:00
..
accessibility
…
acpi
Merge branch 'acpi-video'
2014-05-16 23:43:56 +02:00
amba
Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-04-05 15:37:40 -07:00
ata
Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2014-05-21 18:35:42 +09:00
atm
atm: idt77105: Use del_timer_sync() in exit path
2014-03-25 21:06:02 -04:00
auxdisplay
…
base
Merge 3.15-rc6 into staging-next.
2014-05-22 23:27:17 +09:00
bcma
bcma: gpio: register 32 GPIOs on BCM5357
2014-03-27 14:20:04 -04:00
block
floppy: don't write kernel-only members to FDRAWCMD ioctl output
2014-05-05 07:46:56 -07:00
bluetooth
Bluetooth: Add support for Lite-on [04ca:3007]
2014-04-25 09:47:16 +03:00
bus
bus: mvebu-mbus: allow several windows with the same target/attribute
2014-04-24 03:48:08 +00:00
cdrom
…
char
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
2014-05-21 18:56:35 +09:00
clk
Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mike.turquette/linux
2014-05-21 18:55:17 +09:00
clocksource
Merge branch 'clockevents/3.15-fixes' of git://git.linaro.org/people/daniel.lezcano/linux into timers/urgent
2014-04-29 19:26:58 +02:00
connector
net: Use netlink_ns_capable to verify the permisions of netlink messages
2014-04-24 13:44:54 -04:00
cpufreq
Merge tag 'pm+acpi-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-05-21 17:58:34 +09:00
cpuidle
Merge branch 'pm-cpuidle'
2014-04-08 13:27:40 +02:00
crypto
crypto: caam - add allocation failure handling in SPRINTFCAT macro
2014-04-28 18:17:18 +08:00
dca
…
devfreq
PM / devfreq: Rewrite devfreq_update_status() to fix multiple bugs
2014-03-21 11:16:30 +09:00
dio
…
dma
dma: fix eDMA driver as a subsys_initcall
2014-04-16 12:03:47 +05:30
edac
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2014-04-04 09:50:07 -07:00
eisa
…
extcon
extcon: Move OF helper function to extcon core and change function name
2014-03-19 14:41:58 +09:00
firewire
…
firmware
iscsi_ibft: Fix finding Broadcom specific ibft sign
2014-05-13 14:54:14 -04:00
fmc
…
gpio
gpio: mcp23s08: Bug fix of SPI device tree registration.
2014-05-09 10:28:16 +02:00
gpu
Merge tag 'drm-intel-fixes-2014-05-16' of git://anongit.freedesktop.org/drm-intel into drm-fixes
2014-05-20 09:56:26 +10:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2014-05-07 16:07:58 -07:00
hsi
…
hv
Drivers: hv: vmbus: Negotiate version 3.0 when running on ws2012r2 hosts
2014-04-16 14:14:07 -07:00
hwmon
hwmon: (emc1403) Support full range of known chip revision numbers
2014-05-12 08:37:06 -07:00
hwspinlock
…
i2c
i2c: rcar: bail out on zero length transfers
2014-05-14 18:59:57 +02:00
ide
…
idle
intel_idle: fix IVT idle state table setting
2014-04-21 23:36:07 +02:00
iio
Merge 3.15-rc6 into staging-next.
2014-05-22 23:27:17 +09:00
infiniband
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-05-21 18:03:14 +09:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-05-08 14:06:45 -07:00
iommu
iommu/amd: fix enabling exclusion range for an exact device
2014-05-13 12:33:12 +02:00
ipack
…
irqchip
Merge tag 'mvebu-irqchip-fixes-3.15' of git://git.infradead.org/linux-mvebu into irq/urgent
2014-04-29 19:23:22 +02:00
isdn
hisax/icc: add missing semicolon after label
2014-04-22 21:22:47 -04:00
leds
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-04-10 09:06:10 -07:00
lguest
drivers/lguest/page_tables.c: rename do_set_pte()
2014-04-07 16:35:52 -07:00
macintosh
…
mailbox
…
mcb
drivers: mcb: fix memory leak in chameleon_parse_cells() error path
2014-04-16 12:28:47 -07:00
md
Merge tag 'dm-3.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
2014-05-21 17:57:31 +09:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2014-05-21 19:01:08 +09:00
memory
memory: mvebu-devbus: fix the conversion of the bus width
2014-04-17 04:14:30 +00:00
memstick
…
message
Merge tag 'pci-v3.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2014-04-01 15:14:04 -07:00
mfd
mmc: rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"
2014-05-08 08:44:50 +01:00
misc
misc: Grammar s/addition/additional/
2014-04-16 12:28:47 -07:00
mmc
mmc: rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"
2014-05-08 08:44:50 +01:00
mtd
Merge tag 'for-linus-20140507' of git://git.infradead.org/linux-mtd
2014-05-07 16:28:52 -07:00
net
net: macb: Fix race between HW and driver
2014-05-05 17:11:18 -04:00
nfc
…
ntb
ntb: Use pci_enable_msix_range() instead of pci_enable_msix()
2014-04-07 10:59:20 -07:00
nubus
…
of
of: make of_update_property() usable earlier in the boot process
2014-05-14 15:27:36 +01:00
oprofile
oprofile, nmi-timer: Fix CPU hotplug callback registration
2014-03-20 13:43:46 +01:00
parisc
…
parport
…
pci
Merge tag 'pci-v3.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2014-05-21 18:57:25 +09:00
pcmcia
Merge tag 'pci-v3.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2014-04-01 15:14:04 -07:00
phy
phy: fix kernel oops in phy_lookup()
2014-04-24 12:53:38 -07:00
pinctrl
sh-pfc: r8a7791: Fix definition of MOD_SEL3
2014-04-23 16:09:53 +02:00
platform
goldfish: pipe: fix warnings for 32bit builds
2014-05-16 11:32:51 -07:00
pnp
asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*
2014-05-05 16:07:46 -07:00
power
power/reset: vexpress: Fix restart/power off operation
2014-04-24 17:20:50 +01:00
powercap
Merge tag 'cpu-hotplug-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-04-07 14:55:46 -07:00
pps
…
ps3
…
ptp
net: ptp: move PTP classifier in its own file
2014-04-01 16:43:18 -04:00
pwm
Shiraz has moved
2014-04-18 16:40:08 -07:00
rapidio
rapidio: rework device hierarchy and introduce mport class of devices
2014-04-07 16:36:07 -07:00
regulator
regulator: pbias: Convert to use regmap helper functions
2014-04-14 22:16:25 +01:00
remoteproc
…
reset
Merge branch 'reset/for_v3.15' of git://git.pengutronix.de/git/pza/linux into next/drivers
2014-03-27 01:28:19 +01:00
rpmsg
…
rtc
drivers/rtc/rtc-hym8563.c: set uie_unsupported
2014-05-11 17:55:48 +09:00
s390
s390/chsc: fix SEI usage on old FW levels
2014-04-17 12:46:28 +02:00
sbus
…
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-05-05 15:59:46 -07:00
sfi
…
sh
drivers: sh: compile drivers/sh/pm_runtime.c if ARCH_SHMOBILE_MULTI
2014-05-12 16:05:01 +09:00
sn
…
spi
Merge remote-tracking branches 'spi/fix/pxa2xx' and 'spi/fix/qup' into spi-linus
2014-05-13 19:08:34 +01:00
spmi
…
ssb
…
staging
Merge 3.15-rc6 into staging-next.
2014-05-22 23:27:17 +09:00
target
target: fix memory leak on XCOPY
2014-05-17 15:49:40 -07:00
tc
…
thermal
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2014-04-10 09:15:46 -07:00
tty
Merge 3.15-rc6 into staging-next.
2014-05-22 23:27:17 +09:00
uio
…
usb
USB: Nokia 5300 should be treated as unusual dev
2014-05-03 19:41:07 -04:00
uwb
uwb: don't call spin_unlock_irq in a USB completion handler
2014-04-24 12:45:40 -07:00
vfio
Merge tag 'vfio-v3.15-rc1' of git://github.com/awilliam/linux-vfio
2014-04-03 14:05:02 -07:00
vhost
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-04-12 16:51:08 -07:00
video
video: Kconfig: move drm and fb into separate menus
2014-04-17 08:10:20 +03:00
virt
…
virtio
…
vlynq
…
vme
vme_tsi148: Utilize to_pci_dev() macro
2014-04-16 14:08:37 -07:00
w1
w1: avoid recursive device_add
2014-04-16 14:07:51 -07:00
watchdog
Merge tag 'cpu-hotplug-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-04-07 14:55:46 -07:00
xen
Merge tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2014-05-13 11:21:01 +09:00
zorro
…
Kconfig
…
Makefile
Merge tag 'renesas-sh-drivers-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
2014-05-22 04:26:23 +09:00