Linus Torvalds
8f5d27084d
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux ...
Pull i2c new drivers from Wolfram Sang:
"Here is a pull request from i2c hoping for the "new driver" rule.
Originally, I wanted to send this request during the merge window, but
code checkers with very recent additions complained, so a few fixups
were needed. So, some more time went by and I merged rc1 to get a
stable base"
So the "new driver" rule is really about drivers that people absolutely
need for the kernel to work on new hardware, which is not so much the
case for i2c. So I considered not pulling this, but eventually
relented.
Just for FYI: the whole (and only) point of "new drivers" is not that
new drivers cannot regress things (they can, and they have - by
triggering badly tested code on machines that never triggered that code
before), but because they can bring to life machines that otherwise
wouldn't be useful at all without the drivers.
So the new driver rule is for essential things that actual consumers
would care about, ie devices like networking or disk drivers that matter
to normal people (not server people - they run old kernels anyway, so
mainlining new drivers is irrelevant for them).
* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: sun6-p2wi: fix call to snprintf
i2c: rk3x: add NULL entry to the end of_device_id array
i2c: sun6i-p2wi: use proper return value in probe
i2c: sunxi: add P2WI (Push/Pull 2 Wire Interface) controller support
i2c: sunxi: add P2WI DT bindings documentation
i2c: rk3x: add driver for Rockchip RK3xxx SoC I2C adapter
2014-06-21 19:01:15 -10:00
Merge branches 'acpi-general', 'acpi-processor', 'acpi-lpss' and 'acpi-battery'
2014-06-19 14:40:48 +02:00
Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2014-06-09 14:58:36 -07:00
atm: fore200e.c: Cleaning up uninitialized variables
2014-06-02 17:11:03 -07:00
More ACPI and power management updates for 3.16-rc1
2014-06-12 13:14:19 -07:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2014-06-19 17:56:43 -10:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
bus/arm-cci: add dependency on OF && CPU_V7
2014-06-17 17:09:35 +02:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2014-06-11 08:41:17 -07:00
random: fix entropy accounting bug introduced in v3.15
2014-06-17 14:23:14 -10:00
This pull request contains the second half the of the clk changes for
2014-06-15 16:02:20 -10:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-04 15:57:20 -07:00
Char / misc driver patches for 3.16-rc1
2014-06-03 08:06:56 -07:00
cpufreq: unlock when failing cpufreq_update_policy()
2014-06-18 21:52:20 +02:00
cpuidle: mvebu: Fix the name of the states
2014-06-18 21:54:46 +02:00
crypto/nx: disable NX on little endian builds
2014-06-11 17:03:19 +10:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-06-10 10:28:45 -07:00
PCI changes for the v3.16 merge window:
2014-06-02 12:15:19 -07:00
sound updates for 3.16-rc1
2014-06-04 09:08:25 -07:00
Merge branch 'arm64-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-05 13:15:32 -07:00
gpio: of: Fix handling for deferred probe for -gpio suffix
2014-06-12 09:57:00 +02:00
sound fixes for 3.16-rc2
2014-06-19 18:49:37 -10:00
Most of this is cleaning up various driver sysfs permissions so we can
2014-06-11 16:09:14 -07:00
hsi: omap_ssi_port: use normal module refcounting
2014-06-05 00:59:05 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
hwmon: vexpress: Use devm helper for hwmon device registration
2014-06-12 08:36:50 -07:00
i2c: sun6-p2wi: fix call to snprintf
2014-06-17 14:28:04 +02:00
First set of IIO fixes for the 3.16 cycle.
2014-06-18 10:41:08 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-06-12 22:38:32 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-06-09 18:46:02 -07:00
IOMMU Updates for Linux v3.16
2014-06-06 11:48:46 -07:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-04 15:59:13 -07:00
isdn/capi: fix (middleware) device nodes
2014-06-04 23:13:41 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-06-12 13:08:09 -07:00
. Add dm_accept_partial_bio interface to DM core to allow DM targets
2014-06-12 13:33:29 -07:00
Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2014-06-12 23:04:28 -07:00
This pull-request contains some misplaced patches from Tony
2014-06-12 12:42:32 -07:00
Char / Misc driver fixes for 3.16-rc2
2014-06-21 06:43:19 -10:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-06-12 10:30:18 -07:00
vxlan: Checksum fixes
2014-06-15 01:00:50 -07:00
kernel/printk: use symbolic defines for console loglevels
2014-06-04 16:54:17 -07:00
OF: fix of_find_node_by_path() assumption that of_allnodes is root
2014-06-16 13:31:44 -05:00
parport: convert use of typedef ctl_table to struct ctl_table
2014-06-06 16:08:15 -07:00
PCI changes for the v3.16 merge window (part 2):
2014-06-12 13:20:24 -07:00
This is the bulk of pin control changes for the v3.16
2014-06-03 11:20:32 -07:00
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
2014-06-10 16:58:32 -07:00
Merge branches 'pnp', 'powercap', 'pm-runtime' and 'pm-opp'
2014-06-03 23:13:00 +02:00
ACPI and power management updates for 3.16-rc1
2014-06-04 08:57:16 -07:00
pwm: Changes for v3.16-rc1
2014-06-11 14:06:55 -07:00
rapidio/tsi721: use pci_enable_msix_exact() instead of pci_enable_msix()
2014-06-06 16:08:13 -07:00
Merge remote-tracking branches 'regulator/fix/as3722', 'regulator/fix/ltc3589' and 'regulator/fix/palmas' into regulator-linus
2014-06-16 16:05:57 +01:00
remoteproc: da8xx: don't select CMA on no-MMU
2014-06-17 17:09:36 +02:00
ARM: SoC driver changes
2014-06-02 16:35:49 -07:00
drivers/rtc/rtc-puv3.c: remove "&dev->" for typo issue MIME-Version: 1.0
2014-06-20 08:22:39 +08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2014-06-21 06:47:01 -10:00
drivers: scsi: mvsas: fix compiling issue by adding 'MVS_' for "enum pci_interrupt_cause"
2014-06-20 08:22:39 +08:00
SH Driver Update for v3.16
2014-06-06 11:44:09 -07:00
spi/pxa2xx: change default supported DMA burst size to 1
2014-06-06 10:52:46 +01:00
imx-drm: parallel-display: Fix DPMS default state.
2014-06-19 17:33:37 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-06-12 22:38:32 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2014-06-11 14:26:21 -07:00
TTY/Serial bugfixes for 3.16-rc2
2014-06-21 06:41:42 -10:00
Revert "uio: fix vma io range check in mmap"
2014-06-17 16:07:08 -07:00
USB: usbtest: add a timeout for scatter-gather tests
2014-06-17 17:05:50 -07:00
A handful of VFIO bug fixes for v3.16
2014-06-07 20:12:15 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-06-12 22:38:32 -07:00
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
2014-06-19 18:40:36 -10:00
w1: mxc_w1: Fix incorrect "presence" status
2014-06-19 17:51:46 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2014-06-21 06:47:01 -10:00
xen: regression and PVH fixes for 3.16-rc1
2014-06-19 07:53:27 -10:00
Char / misc driver patches for 3.16-rc1
2014-06-03 08:06:56 -07:00
8f5d27084d