sugar/linux
1
0
Fork 0
Code Activity
Files
a7ca08038b990e2cbed324948664b2d8940fd782
linux/drivers
History
Linus Torvalds 4166fb6459 Merge tag 'srpt-srq-type' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 
Pull infiniband fix from Roland Dreier:
 "Add a fix for a bug hit by Alexey Shvetsov in ib_srtp that hits on
  non-mlx4 hardware."

* tag 'srpt-srq-type' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/srpt: Set srq_type to IB_SRQT_BASIC
2012-04-12 18:51:32 -07:00
..
accessibility
…
acpi
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-04-06 19:56:04 -07:00
amba
…
ata
…
atm
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
auxdisplay
…
base
drivers/base: fix compiler warning in SoC export driver - idr should be ida
2012-04-09 14:54:22 -07:00
bcma
bcma: fix build error on MIPS; implicit pcibios_enable_device
2012-04-10 14:13:30 -04:00
block
Merge tag 'stable/for-linus-3.4-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2012-04-06 17:54:53 -07:00
bluetooth
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
2012-04-09 15:47:49 -04:00
cdrom
…
char
Merge tag 'tty-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2012-04-12 15:36:33 -07:00
clk
…
clocksource
Revert "clocksource: Load the ACPI PM clocksource asynchronously"
2012-04-12 00:05:05 +02:00
connector
…
cpufreq
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-04-05 22:13:39 -07:00
cpuidle
Merge branches 'idle-fix' and 'misc' into release
2012-04-06 21:48:59 -04:00
crypto
…
dca
…
devfreq
Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:03:32 -07:00
dio
…
dma
Merge tag 'dmaengine-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine
2012-04-10 15:30:16 -07:00
edac
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
2012-04-06 17:56:20 -07:00
eisa
…
firewire
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
firmware
…
gpio
gpio: tegra: Iterate over the correct number of banks
2012-04-04 13:13:18 -06:00
gpu
Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes
2012-04-12 17:42:01 +01:00
hid
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
hsi
…
hv
…
hwmon
hwmon: (ad7314) Adds missing spi_dev initialization
2012-04-03 17:08:28 -07:00
hwspinlock
…
i2c
i2c: prevent spurious interrupt on Designware controllers
2012-04-10 08:09:03 -07:00
ide
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
idle
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
ieee802154
…
infiniband
Merge tag 'srpt-srq-type' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2012-04-12 18:51:32 -07:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-04-12 12:49:07 -07:00
iommu
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
isdn
Merge tag 'tty-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2012-04-12 15:36:33 -07:00
leds
Merge tag 'mfd_3.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2012-03-28 13:56:35 -07:00
lguest
…
macintosh
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
mca
…
md
md/bitmap: prevent bitmap_daemon_work running while initialising bitmap
2012-04-12 16:05:06 +10:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-04-11 11:05:34 -07:00
memstick
…
message
Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system
2012-03-28 15:58:21 -07:00
mfd
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
misc
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
mmc
mmc: use really long write timeout to deal with crappy cards
2012-04-05 20:32:34 -04:00
mtd
fix breakage in mtdchar_open(), sanitize failure exits
2012-04-09 01:38:55 -04:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-04-12 14:04:33 -07:00
nfc
…
nubus
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
of
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6
2012-03-28 14:08:46 -07:00
oprofile
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
parisc
Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system
2012-03-28 15:58:21 -07:00
parport
…
pci
Merge tag 'stable/for-linus-3.4-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2012-04-06 17:54:53 -07:00
pcmcia
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
2012-03-29 16:00:48 -07:00
pinctrl
…
platform
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
pnp
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
power
Merge tag 'for-v3.4-rc1' of git://git.infradead.org/battery-2.6
2012-03-30 16:09:02 -07:00
pps
…
ps3
…
ptp
…
rapidio
…
regulator
Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
2012-04-10 10:26:41 -07:00
remoteproc
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
rpmsg
…
rtc
drivers/rtc/rtc-pl031.c: enable clock on all ST variants
2012-04-12 13:12:12 -07:00
s390
Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system
2012-03-28 15:58:21 -07:00
sbus
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
scsi
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
sfi
…
sh
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
2012-03-30 00:09:17 -07:00
sn
…
spi
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
ssb
…
staging
Merge tag 'staging-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2012-04-12 15:35:12 -07:00
target
tcm_fc: Do not free tpg structure during wq allocation failure
2012-04-06 18:57:05 -07:00
tc
…
thermal
…
tty
Merge tag 'tty-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2012-04-12 15:36:33 -07:00
uio
…
usb
xHCI: Correct the #define XHCI_LEGACY_DISABLE_SMI
2012-04-11 08:31:06 -07:00
uwb
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
vhost
…
video
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-04-05 22:13:39 -07:00
virt
…
virtio
virtio-pci: switch to PM ops macro to initialise PM functions
2012-03-31 08:09:51 +05:30
vlynq
…
w1
…
watchdog
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
xen
Merge tag 'stable/for-linus-3.4-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2012-04-06 17:54:53 -07:00
zorro
…
Kconfig
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
Makefile
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00