Linus Torvalds 52caa59ed3 Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux ... Pull i2c updates from Wolfram Sang: "Highlights: - new drivers for Intel ismt & Broadcom bcm2835 - a number of drivers got support for more variants and mostly got cleaned up on the way (sis630, i801, at91, tegra, designware) - i2c got rid of all *_set_drvdata(..., NULL) on remove/probe failure - removed the i2c_smbus_process_call from the core since there are no users - mxs can now switch between PIO and DMA depending on the message size and the bus speed can now be arbitrary In addition, there is the usual bunch of fixes, cleanups, devm_* conversions, etc" Fixed conflict (and buggy devm_* conversion) in i2c-s3c2410.c * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (39 commits) i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls i2c: pxa: remove incorrect __exit annotations i2c: ocores: Fix pointer to integer cast warning i2c: tegra: remove warning dump if timeout happen in transfer i2c: fix i2c-ismt.c printk format warning i2c: i801: Add Device IDs for Intel Wellsburg PCH i2c: add bcm2835 driver i2c: ismt: Add Seth and Myself as maintainers i2c: sis630: checkpatch cleanup i2c: sis630: display unsigned hex i2c: sis630: use hex to constants for SMBus commands i2c: sis630: fix behavior after collision i2c: sis630: clear sticky bits i2c: sis630: Add SIS964 support i2c: isch: Add module parameter for backbone clock rate if divider is unset i2c: at91: fix unsed variable warning when building with !CONFIG_OF i2c: Adding support for Intel iSMT SMBus 2.0 host controller i2c: sh_mobile: don't send a stop condition by default inside transfers i2c: sh_mobile: eliminate an open-coded "goto" loop i2c: sh_mobile: fix timeout error handling ...		2013-02-26 09:41:53 -08:00
..
ABI	ksm: add sysfs ABI Documentation	2013-02-23 17:50:19 -08:00
DocBook	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2013-02-25 16:46:44 -08:00
EDID	drm: Load EDID: Explain better how to write your own EDID firmware	2013-01-20 19:22:19 +10:00
PCI	PCI/MSI: Enable multiple MSIs with pci_enable_msi_block_auto()	2013-01-24 17:25:13 +01:00
RCU	Merge branches 'urgent.2012.10.27a', 'doc.2012.11.16a', 'fixes.2012.11.13a', 'srcu.2012.10.27a', 'stall.2012.11.13a', 'tracing.2012.11.08a' and 'idle.2012.10.24a' into HEAD	2012-11-16 09:59:58 -08:00
accounting	doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c	2012-11-26 14:22:21 +01:00
acpi	ACPI / Documentation: refer to correct file for acpi_platform_device_ids[] table	2013-02-13 13:43:02 +01:00
aoe	aoe: allow user to disable target failure timeout	2012-12-17 17:15:25 -08:00
arm	fbdev changes for 3.8:	2012-12-15 13:03:48 -08:00
arm64	arm64: Add simple earlyprintk support	2013-01-22 17:51:01 +00:00
auxdisplay	…
backlight	backlight: lp855x_bl: support new LP8557 device	2013-02-21 17:22:25 -08:00
blackfin	…
block	block: Kill bi_destructor	2012-09-09 10:35:39 +02:00
blockdev	…
bus-devices	ARM: OMAP2+: gpmc: generic timing calculation	2012-11-09 18:07:11 +05:30
cdrom	…
cgroups	cgroups: move cgroup_event_listener.c to tools/cgroup	2013-01-07 09:41:28 -08:00
connector	…
console	…
cpu-freq	cpufreq: Update Documentation for cpus and related_cpus	2013-02-02 00:01:16 +01:00
cpuidle	Honor state disabling in the cpuidle ladder governor	2012-09-04 01:35:44 +02:00
cris	…
crypto	KEYS: Document asymmetric key type	2012-10-08 13:50:12 +10:30
development-process	…
device-mapper	DM-RAID: Fix RAID10's check for sufficient redundancy	2013-01-24 12:02:36 +11:00
devicetree	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-02-26 09:41:53 -08:00
driver-model	lib: devres: Introduce devm_ioremap_resource()	2013-01-22 09:41:43 -08:00
dvb	[media] get_dvb_firmware: Fix the location of firmware for Terratec HTC	2013-01-01 11:18:26 -02:00
early-userspace	…
extcon	…
fault-injection	doc: fix quite a few typos within Documentation	2012-11-19 14:28:24 +01:00
fb	…
filesystems	f2fs: update f2fs document to reflect SIT/NAT layout correctly	2013-01-04 09:42:59 +09:00
firmware_class	firmware loader: document firmware cache mechanism	2012-11-14 15:07:18 -08:00
frv	…
hid	HID: remove x bit from sensor doc	2012-12-14 08:48:59 +01:00
hwmon	hwmon: (jc42) Add support for MCP98244	2013-02-06 09:58:07 -08:00
i2c	i2c: i801: Add Device IDs for Intel Wellsburg PCH	2013-02-15 20:46:01 +01:00
i2o	…
ia64	doc: aliasing-test: close fd on write error	2012-09-01 09:57:10 -07:00
ide	…
infiniband	IB/ipoib: Add rtnl_link_ops support	2012-09-20 16:49:17 -04:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2012-12-13 12:00:48 -08:00
ioctl	wanrouter: completely decouple obsolete code from kernel.	2013-01-31 19:20:33 -05:00
isdn	…
ja_JP	…
kbuild	kbuild: create a rule to run the pre-processor on *.dts files	2013-02-08 14:38:07 +00:00
kdump	kexec: update URL of kexec homepage	2012-07-18 18:35:57 -07:00
ko_KR	…
laptops	Documentation/laptops: remove depends on CONFIG_EXPERIMENTAL	2013-01-21 14:52:42 -08:00
leds	Documentation: leds: update LP55xx family devices	2013-02-06 15:59:30 -08:00
m68k	…
make	…
memory-devices	…
mips	…
misc-devices	doc: fix quite a few typos within Documentation	2012-11-19 14:28:24 +01:00
mmc	mmc: core: Extend sysfs to ext_csd parameters for RPMB support	2012-12-06 13:54:48 -05:00
mn10300	…
mtd	…
namespaces	userns: Recommend use of memory control groups.	2013-01-26 22:20:06 -08:00
netlabel	…
networking	tcp: remove Appropriate Byte Count support	2013-02-05 14:51:16 -05:00
nfc	NFC: Update pn544 documentation	2013-01-10 01:27:46 +01:00
parisc	…
pcmcia	…
power	suspend: enable freeze timeout configuration through sys	2013-02-09 22:32:48 +01:00
powerpc	powerpc: Documentation for transactional memory on powerpc	2013-02-15 17:02:25 +11:00
pps	…
prctl	seccomp: Make syscall skipping and nr changes more consistent	2012-10-02 21:14:29 +10:00
pti	…
ptp	…
rapidio	…
s390	…
scheduler	sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW	2012-09-13 16:52:04 +02:00
scsi	[SCSI] hptiop: Support HighPoint RR4520/RR4522 HBA	2012-11-27 08:59:43 +04:00
security	Documentation: fix Documentation/security/00-INDEX	2012-12-17 17:15:22 -08:00
serial	tty: Update serial core API documentation	2013-01-15 21:57:44 -08:00
sh	…
sound	ALSA: compress: add support for gapless playback	2013-02-14 12:30:22 +01:00
spi	Documentation: remove __dev* attributes.	2013-01-03 15:57:16 -08:00
sysctl	Documentation/sysctl/kernel.txt: document /proc/sys/shmall	2013-01-04 16:11:46 -08:00
target	target: Simplify fabric sense data length handling	2012-09-17 17:12:58 -07:00
thermal	drm/nouveau/hwmon: s/fan0/fan1/	2013-02-20 16:00:25 +10:00
timers	…
trace	ACPI and power management updates for 3.9-rc1	2013-02-20 11:26:56 -08:00
usb	USB: report submission of active URBs	2012-11-11 18:10:46 -08:00
vDSO	…
video4linux	[media] radio-si470x doc: add info about v4l2-ctl and sox+alsa	2013-02-13 17:33:20 -02:00
virtual	Merge tag 'kvm-3.9-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2013-02-24 13:07:18 -08:00
vm	ksm: add some comments	2013-02-23 17:50:23 -08:00
w1	w1: w1_therm: Add force-pullup option for "broken" sensors	2013-02-18 13:55:24 -08:00
watchdog	watchdog: fix watchdog-test.c build warning	2012-08-29 17:12:58 +02:00
wimax	…
x86	Merge branch 'x86/microcode' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-02-22 19:22:52 -08:00
xtensa	xtensa: initialize atomctl SR	2012-12-18 21:10:22 -08:00
zh_CN	Driver core patches for 3.9-rc1	2013-02-21 12:05:51 -08:00
.gitignore	…
00-INDEX	Documentation: update top level 00-INDEX file with new additions	2013-02-18 10:38:54 +01:00
BUG-HUNTING	…
Changes	…
CodingStyle	Documentation: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:38:03 -08:00
DMA-API-HOWTO.txt	Documentation DMA-API-HOWTO.txt Add dma mapping error check usage examples	2012-10-24 17:07:43 +02:00
DMA-API.txt	dma-debug: New interfaces to debug dma mapping errors	2012-10-24 17:06:43 +02:00
DMA-ISA-LPC.txt	…
DMA-attributes.txt	common: DMA-mapping: add DMA_ATTR_FORCE_CONTIGUOUS attribute	2012-11-29 03:30:34 -08:00
HOWTO	HOWTO: fix double words typo	2012-12-10 15:54:27 +01:00
IPMI.txt	IPMI: Remove SMBus driver info from the docs	2012-10-16 18:07:12 -07:00
IRQ-affinity.txt	…
IRQ-domain.txt	irqdomain: update documentation	2012-12-05 23:52:10 +00:00
IRQ.txt	…
Intel-IOMMU.txt	…
Makefile	…
ManagementStyle	…
SAK.txt	…
SM501.txt	…
SecurityBugs	…
SubmitChecklist	…
SubmittingDrivers	…
SubmittingPatches	…
VGA-softcursor.txt	…
applying-patches.txt	…
atomic_ops.txt	Documentation: Memory barrier semantics of atomic_xchg()	2013-01-08 14:14:55 -08:00
bad_memory.txt	…
basic_profiling.txt	…
binfmt_misc.txt	…
braille-console.txt	…
bt8xxgpio.txt	…
btmrvl.txt	…
bus-virt-phys-mapping.txt	…
cachetlb.txt	…
circular-buffers.txt	…
clk.txt	…
coccinelle.txt	…
cpu-hotplug.txt	doc: Add x86 CPU0 online/offline feature	2012-11-14 09:39:44 -08:00
cpu-load.txt	…
cputopology.txt	…
crc32.txt	…
dcdbas.txt	…
debugging-modules.txt	…
debugging-via-ohci1394.txt	…
dell_rbu.txt	…
devices.txt	firmware: remove last vestiges of dabusb	2012-11-21 13:03:01 -08:00
digsig.txt	…
dma-buf-sharing.txt	doc: fix quite a few typos within Documentation	2012-11-19 14:28:24 +01:00
dmaengine.txt	…
dontdiff	x86: remove offsets.h from .gitignore and dontdiff	2012-11-19 14:10:53 +01:00
dynamic-debug-howto.txt	dynamic_debug: dynamic hex dump	2013-01-17 12:19:09 -08:00
edac.txt	Merge branch 'devel'	2012-07-29 21:11:05 -03:00
eisa.txt	…
email-clients.txt	…
flexible-arrays.txt	…
futex-requeue-pi.txt	…
gcov.txt	…
gpio.txt	gpiolib: provide provision to register pin ranges	2012-11-11 19:06:00 +01:00
highuid.txt	…
hw_random.txt	…
hwspinlock.txt	…
init.txt	…
initrd.txt	…
intel_txt.txt	Documentation: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:38:03 -08:00
io-mapping.txt	…
io_ordering.txt	…
iostats.txt	…
irqflags-tracing.txt	…
isapnp.txt	…
java.txt	…
kernel-doc-nano-HOWTO.txt	Kernel-doc: Convention: Use a "Return" section to describe return values	2012-11-27 21:08:57 +01:00
kernel-docs.txt	…
kernel-parameters.txt	PCI changes for the v3.9 merge window:	2013-02-25 21:18:18 -08:00
kmemcheck.txt	…
kmemleak.txt	…
kobject.txt	Documentation: Fix "struct kobj_type" to include newer members.	2012-09-04 16:06:34 -07:00
kprobes.txt	…
kref.txt	kref: Add kref_get_unless_zero documentation	2012-11-28 18:36:06 +10:00
ldm.txt	…
local_ops.txt	…
lockdep-design.txt	…
lockstat.txt	locking/stat: Fix a typo	2013-02-19 08:42:37 +01:00
lockup-watchdogs.txt	…
logo.gif	…
logo.txt	…
magic-number.txt	wanrouter: completely decouple obsolete code from kernel.	2013-01-31 19:20:33 -05:00
md.txt	…
media-framework.txt	[media] Documentation/media-framework.txt: fix a sentence	2013-02-08 13:27:13 -02:00
memory-barriers.txt	Documentation: Memory barrier semantics of atomic_xchg()	2013-01-08 14:14:55 -08:00
memory-hotplug.txt	hotplug: update nodemasks management	2012-12-12 17:38:33 -08:00
mono.txt	…
mutex-design.txt	…
nommu-mmap.txt	…
numastat.txt	…
oops-tracing.txt	…
padata.txt	…
parport-lowlevel.txt	…
parport.txt	…
percpu-rw-semaphore.txt	percpu-rw-semaphore: fix documentation typos	2012-09-26 19:56:15 +02:00
pi-futex.txt	…
pinctrl.txt	drivers/pinctrl: grab default handles from device core	2013-01-23 16:39:51 +01:00
pnp.txt	…
preempt-locking.txt	…
printk-formats.txt	lib/vsprintf.c: add %pa format specifier for phys_addr_t types	2013-02-21 17:22:20 -08:00
pwm.txt	pwm: add devm_pwm_get() and devm_pwm_put()	2012-09-10 17:05:45 +02:00
ramoops.txt	pstore/ftrace: Convert to its own enable/disable debugfs knob	2012-09-06 22:16:58 -07:00
rbtree.txt	rbtree: move augmented rbtree functionality to rbtree_augmented.h	2012-10-09 16:22:40 +09:00
remoteproc.txt	remoteproc: add rproc_report_crash function to notify rproc crashes	2012-09-18 12:53:22 +03:00
rfkill.txt	…
robust-futex-ABI.txt	…
robust-futexes.txt	…
rpmsg.txt	Documentation: remove __dev* attributes.	2013-01-03 15:57:16 -08:00
rt-mutex-design.txt	…
rt-mutex.txt	…
rtc.txt	rtc-proc: permit the /proc/driver/rtc device to use other devices	2012-10-06 03:05:01 +09:00
serial-console.txt	…
sgi-ioc4.txt	…
sgi-visws.txt	…
smsc_ece1099.txt	mfd: smsc: Add support for smsc gpio io/keypad driver	2012-10-01 15:27:48 +02:00
sparse.txt	Documentation/sparse.txt: document context annotations for lock checking	2012-12-17 17:15:23 -08:00
spinlocks.txt	…
stable_api_nonsense.txt	…
stable_kernel_rules.txt	…
static-keys.txt	…
svga.txt	…
sysfs-rules.txt	…
sysrq.txt	sparc64: Add global PMU register dumping via sysrq.	2012-10-16 09:34:01 -07:00
unaligned-memory-access.txt	…
unicode.txt	…
unshare.txt	…
vfio.txt	vfio: Trivial Documentation correction	2012-09-21 10:48:03 -06:00
vgaarbiter.txt	…
video-output.txt	…
vme_api.txt	…
volatile-considered-harmful.txt	…
workqueue.txt	…
xz.txt	…
zorro.txt	…