Linus Torvalds
8bbbfa7054
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input ...
Pull input layer updates from Dmitry Torokhov:
"2nd round of updates for the input subsystem. With it input core no
longer limits number of character devices per event handler (such as
evdev) to 32, but switches to dynamic minors once legacy range is
exhausted. This should get multi-seat installations that currently
run our of event devices very quickly.
You will also get an update for Wacom driver and a couple of driver
fixes."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: extend the number of event (and other) devices
Input: mousedev - mark mousedev interfaces as non-seekable
Input: mousedev - rename mixdev_open to opened_by_mixdev
Input: mousedev - reformat structure initializers
Input: mousedev - factor out psaux code to reduce #ifdefery
Input: samsung-keypad - add clk_prepare and clk_unprepare
Input: atmel_mxt_ts - simplify mxt_dump_message
Input: wacom - clean up wacom_query_tablet_data
Input: wacom - introduce wacom_fix_phy_from_hid
Input: wacom - allow any multi-input Intuos device to set prox
Input: wacom - report correct touch contact size for I5/Bamboo
2012-10-13 10:56:03 +09:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-10-08 07:14:06 +09:00
Merge branch 'samsung_platform_data' into staging/for_v3.7
2012-10-05 22:32:05 -03:00
memory-hotplug: update memory block's state and notify userspace
2012-10-09 16:23:02 +09:00
Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block
2012-10-11 09:04:23 +09:00
ARM: SoC fixes
2012-10-11 10:21:48 +09:00
cpufreq: OMAP: use get_cpu_device() instead of omap_device API
2012-10-08 14:58:56 -07:00
ARM: soc: late platform updates
2012-10-07 20:55:16 +09:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-10-10 11:10:41 +09:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel)
2012-10-09 18:26:28 +02:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-10-09 16:08:04 +09:00
fbdev updates for 3.7
2012-10-12 10:21:02 +09:00
Merge branch 'next' into for-linus
2012-10-11 00:45:21 -07:00
hwmon: Drop needless includes of <linux/delay.h>
2012-10-10 15:25:57 +02:00
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
2012-10-11 10:27:51 +09:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-10-10 19:52:19 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-10-13 10:56:03 +09:00
IOMMU Updates for Linux v3.7-rc1
2012-10-08 06:33:44 +09:00
isdn: fix a wrapping bug in isdn_ppp_ioctl()
2012-10-10 22:50:45 -04:00
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
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block
2012-10-11 09:04:23 +09:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-10-12 12:39:17 +09:00
1. New drivers:
2012-10-07 17:29:24 +09:00
pwm: Changes for v3.7-rc1
2012-10-10 20:15:24 +09:00
ARM: SoC fixes
2012-10-11 10:21:48 +09:00
mtd: Disable mtdchar mmap on MMU systems
2012-10-09 15:08:42 +01:00
mcs7830: Fix link state detection
2012-10-12 13:56:52 -04:00
mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file
2012-10-09 16:22:18 +09:00
Xtensa patchset for 3.7
2012-10-09 16:11:46 +09:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
pinctrl/nomadik: use simple or linear IRQ domain
2012-10-10 08:57:26 +02:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-10-08 07:14:06 +09:00
OMAP PM related fixes for v3.7-rc
2012-10-08 15:57:41 -07:00
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
2012-10-06 03:04:56 +09:00
pwm: Changes for v3.7-rc1
2012-10-10 20:15:24 +09:00
rapidio: update for destination ID allocation
2012-10-11 08:50:15 +09:00
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
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: kconfig: fix RTC_INTF defaults connected to RTC_CLASS
2012-10-11 08:50:16 +09:00
s390/zcrypt: remove duplicated include from zcrypt_pcixcc.c
2012-10-09 14:17:00 +02:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-10-10 19:52:19 +09:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-10-10 11:10:41 +09:00
fbdev updates for 3.7
2012-10-12 10:21:02 +09:00
Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block
2012-10-11 09:04:23 +09:00
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
2012-10-06 03:04:56 +09:00
Feature:
2012-10-12 22:20:28 +09:00
mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
2012-10-09 16:22:19 +09:00
Add CDC-ACM support for the CX93010-2x UCMxx USB Modem
2012-10-11 15:18:49 -04:00
vfio: Fix PCI INTx disable consistency
2012-10-10 09:10:32 -06:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-10-10 19:52:19 +09:00
fbdev updates for 3.7
2012-10-12 10:21:02 +09:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
2012-10-07 21:06:10 +09:00
Feature:
2012-10-12 22:20:28 +09:00
8bbbfa7054