mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-17 10:44:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
e29b72f5e129b4dd4b77dc01dba340006bb103f8
linux/drivers
History
Linus Torvalds bbeb0af25f Merge tag 'mfd-for-linus-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 
Pull MFD fix from Samuel Ortiz:
 "This one fixes an s5m8767 regulator build breakage due to a merge
  conflict caused by the MFD s5m API changes."

* tag 'mfd-for-linus-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  regulator: Fix an s5m8767 build failure
2012-07-30 19:06:25 -07:00
..
accessibility
…
acpi
Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86
2012-07-30 11:54:53 -07:00
amba
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
ata
ata/pata_arasan: remove conditional compilation of clk code
2012-07-30 17:25:12 -07:00
atm
…
auxdisplay
…
base
Merge branch 'for-linus-for-3.6-rc1' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-07-30 10:11:31 -07:00
bcma
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2012-07-27 11:15:03 -04:00
block
virtio-blk: allow toggling host cache between writeback and writethrough
2012-07-30 13:30:52 +09:30
bluetooth
Bluetooth: Introduce a flags variable to Three-wire UART state
2012-07-17 14:49:24 -03:00
cdrom
…
char
Merge tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
2012-07-30 13:24:37 -07:00
clk
clk: validate pointer in __clk_disable()
2012-07-30 17:25:13 -07:00
clocksource
Merge tag 'newsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-07-23 16:31:31 -07:00
connector
drivers: connector: fixed coding style issues
2012-07-16 23:23:52 -07:00
cpufreq
Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-07-30 09:45:53 -07:00
cpuidle
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
crypto
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-07-26 20:29:52 -07:00
dca
…
devfreq
…
dio
…
dma
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-07-24 17:12:54 -07:00
edac
Merge branch 'devel'
2012-07-29 21:11:05 -03:00
eisa
…
extcon
Merge tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2012-07-30 12:41:17 -07:00
firewire
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
2012-07-30 09:32:39 -07:00
firmware
firmware_map: make firmware_map_add_early() argument consistent with firmware_map_add_hotplug()
2012-07-30 17:25:17 -07:00
gpio
Merge tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2012-07-30 12:41:17 -07:00
gpu
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2012-07-30 10:06:23 -07:00
hid
Merge branch 'next' into for-linus
2012-07-24 22:43:04 -07:00
hsi
…
hv
Drivers: hv: Change the hex constant to a decimal constant
2012-07-19 15:27:33 -07:00
hwmon
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2012-07-30 10:10:26 -07:00
hwspinlock
hwspinlock/core: use global ID to register hwspinlocks on multiple devices
2012-07-07 22:35:30 +03:00
i2c
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-30 19:03:41 -07:00
ide
…
idle
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
ieee802154
drivers/ieee802154/at86rf230: rework irq handler
2012-07-12 07:54:45 -07:00
iio
iio: fix pointer cast warning
2012-07-15 17:33:17 +01:00
infiniband
Merge tag 'rdma-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2012-07-24 13:56:26 -07:00
input
Merge tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2012-07-30 12:41:17 -07:00
iommu
Merge tag 'iommu-updates-v3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2012-07-24 16:24:11 -07:00
isdn
ISDN: Add check for usb_alloc_urb() result
2012-07-18 09:40:54 -07:00
leds
leds-lp8788: forgotten unlock at lp8788_led_work
2012-07-27 08:16:07 +08:00
lguest
…
macintosh
…
md
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-30 17:25:34 -07:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-30 19:03:41 -07:00
memory
…
memstick
…
message
drivers/message/i2o/i2o_config.c: bound allocation
2012-07-30 17:25:17 -07:00
mfd
Merge tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2012-07-30 12:41:17 -07:00
misc
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-30 17:25:34 -07:00
mmc
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-07-26 20:29:52 -07:00
mtd
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-07-30 11:45:52 -07:00
net
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-30 17:25:34 -07:00
nfc
NFC: Add ISO 14443 type B protocol
2012-07-09 16:42:24 -04:00
nubus
…
of
Merge tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux
2012-07-24 14:07:22 -07:00
oprofile
…
parisc
Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2012-07-24 16:17:07 -07:00
parport
…
pci
Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2012-07-24 16:17:07 -07:00
pcmcia
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
pinctrl
Merge tag 'pinctrl-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
2012-07-24 14:05:46 -07:00
platform
Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86
2012-07-30 11:54:53 -07:00
pnp
…
power
Merge tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-07-26 11:25:33 -07:00
pps
pps: return PTR_ERR on error in device_create
2012-07-30 17:25:21 -07:00
ps3
…
ptp
…
pwm
pwm: pwm-tiehrpwm: PWM driver support for EHRPWM
2012-07-26 07:45:20 +02:00
rapidio
…
regulator
regulator: Fix an s5m8767 build failure
2012-07-31 00:51:09 +02:00
remoteproc
Merge tag 'remoteproc-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc
2012-07-26 16:19:08 -07:00
rpmsg
Merge tag 'remoteproc-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc
2012-07-26 16:19:08 -07:00
rtc
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-30 17:25:34 -07:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-07-26 18:09:01 -07:00
sbus
…
scsi
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
2012-07-25 15:58:48 -04:00
sfi
…
sh
Merge branch 'common/pinctrl' into sh-latest
2012-07-20 16:42:59 +09:00
sn
…
spi
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-07-30 11:45:52 -07:00
ssb
…
staging
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-30 19:03:41 -07:00
target
iscsi-target: Drop bogus struct file usage for iSCSI/SCTP
2012-07-21 02:44:13 -07:00
tc
…
thermal
Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupled', 'cpuidle-tweaks', 'intel_idle-ivb', 'ost', 'red-hat-bz-772730', 'thermal', 'thermal-spear' and 'turbostat-v2' into release
2012-07-26 00:03:58 -04:00
tty
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
uio
…
usb
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-30 17:25:34 -07:00
uwb
…
vhost
vhost: make vhost work queue visible
2012-07-22 01:22:23 +03:00
video
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-30 17:25:34 -07:00
virt
…
virtio
[SCSI] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
2012-07-20 08:59:03 +01:00
vlynq
…
vme
VME: Prevent D16 cycles being split into 8-bit blocks
2012-07-19 15:39:39 -07:00
w1
Merge tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-07-26 11:25:33 -07:00
watchdog
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
xen
Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2012-07-24 16:17:07 -07:00
zorro
…
Kconfig
…
Makefile
…