mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
b472b8e22f9f9bc88dc73017d61609684289fb13
linux/drivers
History
Greg Kroah-Hartman b472b8e22f Merge 3.7-rc3 into usb-next. 
This pulls in all of the USB changes in 3.7-rc3 into usb-next and
resolves the merge issue with:
	drivers/usb/misc/ezusb.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-29 09:04:39 -07:00
..
accessibility
…
acpi
ACPI: missing break
2012-10-26 01:05:56 +02:00
amba
…
ata
Merge branch 'samsung_platform_data' into staging/for_v3.7
2012-10-05 22:32:05 -03:00
atm
sections: fix section conflicts in drivers/atm
2012-10-06 03:04:40 +09:00
auxdisplay
…
base
Merge tag 'pm+acpi-for-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2012-10-26 14:23:35 -07:00
bcma
bcma: fix unregistration of cores
2012-10-15 14:45:51 -04:00
block
Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block
2012-10-11 09:04:23 +09:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
bus
drivers: bus: omap_l3: fixup merge conflict resolution
2012-10-01 19:39:48 -07:00
cdrom
…
char
sonypi: suspend/resume callbacks should be conditionally compiled on CONFIG_PM_SLEEP
2012-10-25 12:05:50 -07:00
clk
Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc
2012-10-02 17:26:42 -07:00
clocksource
Merge tag 'pm-for-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2012-10-02 18:32:35 -07:00
connector
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
cpufreq
Fix memory leak in cpufreq stats.
2012-10-23 01:03:00 +02:00
cpuidle
ACPI idle, CPU hotplug: Fix NULL pointer dereference during hotplug
2012-10-08 22:52:54 -04:00
crypto
Merge tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-10-07 20:55:16 +09:00
dca
…
devfreq
…
dio
…
dma
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
2012-10-26 14:59:01 -07:00
edac
amd64_edac:__amd64_set_scrub_rate(): avoid overindexing scrubrates[]
2012-10-24 16:13:27 +02:00
eisa
…
extcon
extcon : register for cable interest by cable name
2012-10-23 16:32:18 +09:00
firewire
firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel)
2012-10-09 18:26:28 +02:00
firmware
firmware/memmap: avoid type conflicts with the generic memmap_init()
2012-10-19 14:07:47 -07:00
gpio
gpio: mvebu: Add missing breaks in mvebu_gpio_irq_set_type
2012-10-17 17:40:18 +00:00
gpu
drm/radeon: fix ATPX regression in acpi rework
2012-10-24 11:41:57 -04:00
hid
Merge branch 'next' into for-linus
2012-10-11 00:45:21 -07:00
hsi
…
hv
Drivers: hv: Cleanup error handling in vmbus_open()
2012-10-24 15:46:27 -07:00
hwmon
hwmon: (coretemp) Add support for Atom CE4110/4150/4170
2012-10-14 15:21:33 -07:00
hwspinlock
…
i2c
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
2012-10-11 10:27:51 +09:00
ide
sections: fix section conflicts in drivers/ide
2012-10-06 03:04:41 +09:00
idle
…
iio
iio: Remove duplicates for light/ in Kconfig and Makefile
2012-10-19 19:44:06 +01:00
infiniband
Merge branches 'cxgb4' and 'mlx4' into for-next
2012-10-23 09:03:49 -07:00
input
Input: wacom - add touch sensor support for Cintiq 24HD touch
2012-10-25 16:02:36 -07:00
iommu
iommu/tegra: smmu: Fix deadly typo
2012-10-24 16:58:53 +02:00
irqchip
…
isdn
bas_gigaset: fix pre_reset handling
2012-10-26 02:20:36 -04:00
leds
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2012-10-10 20:14:07 +09:00
lguest
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
macintosh
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
md
Merge tag 'md-3.7' of git://neil.brown.name/md
2012-10-13 13:22:01 -07:00
media
[media] Kconfig: Fix dependencies for driver autoselect options
2012-10-17 16:45:56 -03:00
memory
…
memstick
…
message
…
mfd
Merge tag 'for-v3.7' of git://git.infradead.org/battery-2.6
2012-10-07 17:29:24 +09:00
misc
Merge tag 'for-3.7-rc1' of git://gitorious.org/linux-pwm/linux-pwm
2012-10-10 20:15:24 +09:00
mmc
mmc: mxs-mmc: Fix merge issue causing build error
2012-10-11 17:21:40 -04:00
mtd
mtd: Disable mtdchar mmap on MMU systems
2012-10-09 15:08:42 +01:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-10-26 15:00:48 -07:00
nfc
…
nubus
…
of
of/platform: sparse fix
2012-10-17 15:53:03 -05:00
oprofile
mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file
2012-10-09 16:22:18 +09:00
parisc
…
parport
Merge tag 'xtensa-next-20121008' of git://github.com/czankel/xtensa-linux
2012-10-09 16:11:46 +09:00
pci
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
pcmcia
Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes
2012-10-19 15:40:18 -07:00
pinctrl
pinctrl/nomadik: pass DT node to the irqdomain
2012-10-23 11:52:25 +02:00
platform
Merge branches 'fixes-for-37', 'ec' and 'thermal' into release
2012-10-09 01:47:35 -04:00
pnp
…
power
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-10-13 11:27:59 +09:00
pps
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
2012-10-06 03:04:56 +09:00
ps3
…
ptp
…
pwm
Merge tag 'for-3.7-rc1' of git://gitorious.org/linux-pwm/linux-pwm
2012-10-10 20:15:24 +09:00
rapidio
rapidio: update for destination ID allocation
2012-10-11 08:50:15 +09:00
regulator
Merge tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2012-10-05 12:01:30 +09:00
remoteproc
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
rpmsg
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
rtc
drivers/rtc/rtc-imxdi.c: add missing spin lock initialization
2012-10-25 14:37:53 -07:00
s390
s390/css: stop stsch loop after cc 3
2012-10-18 17:50:08 +02:00
sbus
…
scsi
Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes
2012-10-19 15:40:18 -07:00
sfi
…
sh
sh: Fix up more fallout from pointless ARM __iomem churn.
2012-10-15 14:08:48 +09:00
sn
…
spi
Merge tag 'spi-mxs' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc
2012-10-28 11:13:54 -07:00
ssb
…
staging
Merge tag 'staging-3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2012-10-26 10:25:31 -07:00
target
Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block
2012-10-11 09:04:23 +09:00
tc
…
thermal
thermal, cpufreq: Fix build when CPU_FREQ_TABLE isn't configured
2012-10-15 14:00:07 -07:00
tty
Revert "serial: omap: fix software flow control"
2012-10-24 11:57:21 -07:00
uio
mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
2012-10-09 16:22:19 +09:00
usb
Merge 3.7-rc3 into usb-next.
2012-10-29 09:04:39 -07:00
uwb
umc-bus.c: fix usage of device_trylock
2012-10-25 11:39:31 -07:00
vfio
vfio: Fix PCI INTx disable consistency
2012-10-10 09:10:32 -06:00
vhost
vhost: fix mergeable bufs on BE hosts
2012-10-24 23:19:30 -04:00
video
backlight: ili9320: add missing SPI dependency
2012-10-25 14:37:52 -07:00
virt
…
virtio
…
vlynq
…
vme
…
w1
Merge tag 'char-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2012-10-01 12:09:59 -07:00
watchdog
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
2012-10-07 21:06:10 +09:00
xen
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
2012-10-25 15:59:34 -07:00
zorro
…
Kconfig
Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-10-01 18:46:13 -07:00
Makefile
IPMI: Change link order
2012-10-16 18:07:12 -07:00