Mark Brown
724d054490
Merge remote-tracking branch 'regulator/topic/helpers' into regulator-next
2013-09-01 13:50:09 +01:00
Mark Brown
446b4665e3
Merge remote-tracking branch 'regulator/topic/fan53555' into regulator-next
2013-09-01 13:50:08 +01:00
Mark Brown
62696579a0
Merge remote-tracking branch 'regulator/topic/da9063' into regulator-next
2013-09-01 13:50:07 +01:00
Mark Brown
1ad13028e5
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
2013-09-01 13:50:06 +01:00
Mark Brown
5288be36cd
Merge remote-tracking branch 'regulator/topic/as3711' into regulator-next
2013-09-01 13:50:05 +01:00
Mark Brown
28c37c9ce8
Merge remote-tracking branch 'regulator/topic/88pm800' into regulator-next
2013-09-01 13:50:04 +01:00
Mark Brown
5787392598
Merge remote-tracking branch 'spi/topic/txx9' into spi-next
2013-09-01 13:49:18 +01:00
Mark Brown
961722f57c
Merge remote-tracking branch 'spi/topic/topcliff' into spi-next
2013-09-01 13:49:17 +01:00
Mark Brown
989e694647
Merge remote-tracking branch 'spi/topic/tle62x0' into spi-next
2013-09-01 13:49:15 +01:00
Mark Brown
58737f127a
Merge remote-tracking branch 'spi/topic/tel62x0' into spi-next
2013-09-01 13:49:14 +01:00
Mark Brown
e7c57cc124
Merge remote-tracking branch 'spi/topic/tegra' into spi-next
2013-09-01 13:49:13 +01:00
Mark Brown
a3e412dcf5
Merge remote-tracking branch 'spi/topic/sirf' into spi-next
2013-09-01 13:49:12 +01:00
Mark Brown
368ce0bca4
Merge remote-tracking branch 'spi/topic/sh-msiof' into spi-next
2013-09-01 13:49:11 +01:00
Mark Brown
874915ed4b
Merge remote-tracking branch 'spi/topic/sh-hspi' into spi-next
2013-09-01 13:49:10 +01:00
Mark Brown
2dc745b6ef
Merge remote-tracking branch 'spi/topic/s3c64xx' into spi-next
2013-09-01 13:49:09 +01:00
Mark Brown
121a39661b
Merge remote-tracking branch 'spi/topic/rspi' into spi-next
2013-09-01 13:49:08 +01:00
Mark Brown
278ac33bbd
Merge remote-tracking branch 'spi/topic/quad' into spi-next
2013-09-01 13:49:07 +01:00
Mark Brown
85cac43132
Merge remote-tracking branch 'spi/topic/qspi' into spi-next
2013-09-01 13:49:06 +01:00
Mark Brown
793b3cb6ac
Merge remote-tracking branch 'spi/topic/pxa' into spi-next
2013-09-01 13:49:05 +01:00
Mark Brown
720ed2d130
Merge remote-tracking branch 'spi/topic/pl022' into spi-next
2013-09-01 13:49:04 +01:00
Mark Brown
68aa4cb337
Merge remote-tracking branch 'spi/topic/pdata' into spi-next
2013-09-01 13:49:03 +01:00
Mark Brown
11c28cfc1e
Merge remote-tracking branch 'spi/topic/orion' into spi-next
2013-09-01 13:49:02 +01:00
Mark Brown
4374f332d9
Merge remote-tracking branch 'spi/topic/omap-100k' into spi-next
2013-09-01 13:49:01 +01:00
Mark Brown
45bb5065e1
Merge remote-tracking branch 'spi/topic/octeon' into spi-next
2013-09-01 13:49:00 +01:00
Mark Brown
455765f02e
Merge remote-tracking branch 'spi/topic/nuc900' into spi-next
2013-09-01 13:48:59 +01:00
Mark Brown
7c2fde9b1a
Merge remote-tracking branch 'spi/topic/mxs' into spi-next
2013-09-01 13:48:59 +01:00
Mark Brown
9020b75467
Merge remote-tracking branch 'spi/topic/msglen' into spi-next
2013-09-01 13:48:58 +01:00
Mark Brown
84c86edab3
Merge remote-tracking branch 'spi/topic/mpc512x' into spi-next
2013-09-01 13:48:57 +01:00
Mark Brown
4faad26c27
Merge remote-tracking branch 'spi/topic/ioremap' into spi-next
2013-09-01 13:48:56 +01:00
Mark Brown
8e37befc5c
Merge remote-tracking branch 'spi/topic/imx' into spi-next
2013-09-01 13:48:55 +01:00
Mark Brown
497cb4473a
Merge remote-tracking branch 'spi/topic/ep93xx' into spi-next
2013-09-01 13:48:54 +01:00
Mark Brown
afa8f0cd6c
Merge remote-tracking branch 'spi/topic/efm32' into spi-next
2013-09-01 13:48:53 +01:00
Mark Brown
2f2613b028
Merge remote-tracking branch 'spi/topic/dspi' into spi-next
2013-09-01 13:48:52 +01:00
Mark Brown
96b1a28d65
Merge remote-tracking branch 'spi/topic/doc' into spi-next
2013-09-01 13:48:51 +01:00
Mark Brown
b49247907d
Merge remote-tracking branch 'spi/topic/davinci' into spi-next
2013-09-01 13:48:51 +01:00
Mark Brown
7e718b4bd2
Merge remote-tracking branch 'spi/topic/core' into spi-next
2013-09-01 13:48:50 +01:00
Mark Brown
1f54f94284
Merge remote-tracking branch 'spi/topic/clps711x' into spi-next
2013-09-01 13:48:49 +01:00
Mark Brown
db04e17055
Merge remote-tracking branch 'spi/topic/checks' into spi-next
2013-09-01 13:48:48 +01:00
Mark Brown
788a739676
Merge remote-tracking branch 'spi/topic/build' into spi-next
2013-09-01 13:48:47 +01:00
Mark Brown
8e28fb63a7
Merge remote-tracking branch 'spi/topic/bpw' into spi-next
2013-09-01 13:48:46 +01:00
Mark Brown
f1632c3278
Merge remote-tracking branch 'spi/topic/blackfin-v3' into spi-next
2013-09-01 13:48:45 +01:00
Mark Brown
b29bc3df37
Merge remote-tracking branch 'spi/topic/bitbang' into spi-next
2013-09-01 13:48:44 +01:00
Mark Brown
c3dbe2b76a
Merge remote-tracking branch 'spi/topic/bcm2835' into spi-next
2013-09-01 13:48:44 +01:00
Mark Brown
5264af0ca6
Merge remote-tracking branch 'spi/topic/atmel' into spi-next
2013-09-01 13:48:43 +01:00
Wei Yongjun
b6460366fb
spi/qspi: fix missing unlock on error in ti_qspi_start_transfer_one()
...
Add the missing unlock before return from function ti_qspi_start_transfer_one()
in the error handling case.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-09-01 13:47:55 +01:00
wangyuhang
a110f93d8b
spi: quad: fix the name of DT property
...
spi: quad: fix the name of DT property in patch
The previous property name spi-tx-nbits and spi-rx-nbits looks not
human-readable. To make it consistent with other devices, using property
name spi-tx-bus-width and spi-rx-bus-width instead of the previous one
specify the number of data wires that spi controller will work in.
Add the specification in spi-bus.txt.
Signed-off-by: wangyuhang <wangyuhang2014@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-09-01 13:45:14 +01:00
Axel Lin
632b3d62bc
regulator: da9063: Statize da9063_ldo_lim_event
...
da9063_ldo_lim_event() is only referenced in this driver, make it static.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-09-01 13:44:18 +01:00
Mark Brown
6b4c80f947
ASoC: fsl_spdif: Staticse non-exported symbols
...
Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Nicolin Chen <B42378@freescale.com>
2013-09-01 12:52:25 +01:00
Gleb Natapov
6b9e4fa074
KVM/ARM Updates for Linux 3.12
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQEcBAABAgAGBQJSISFLAAoJEEtpOizt6ddyZDAH/jhIQ6svBl0xwZB77feSlzTQ
752CnT+NVLLaDkdcf2vQ+Rw+QDravB1q5erLR3wGmWhvKFK6Xpvf7JNTz++7kzbu
HxenPmOrZhfjtcJ2+1vmvt6fZTe7NvjYc5wjOfX5gHKMwuk4WhF3gvLgUC88b8nT
qprxkVBsHQPWmfhrrUY4E/jgRYQzXxy4jGQNOFC59iur1KM7whd9y2TFl1NCf1SU
rJfnSg7PcowscCz5OauYK6Da4RfFmKWSsBOGDv8COwRNej6zXH68ImKIklhr7OZ+
a1snH0Bs7jQ0cQF/Tdvtih1hTJ3zlKHilFt2enrhK+qBeAbtCacw+lg9tCa0HwI=
=iJqf
-----END PGP SIGNATURE-----
Merge tag 'kvm-arm-for-3.12' of git://git.linaro.org/people/cdall/linux-kvm-arm into queue
KVM/ARM Updates for Linux 3.12
* tag 'kvm-arm-for-3.12' of git://git.linaro.org/people/cdall/linux-kvm-arm:
ARM: KVM: Add newlines to panic strings
ARM: KVM: Work around older compiler bug
ARM: KVM: Simplify tracepoint text
ARM: KVM: Fix kvm_set_pte assignment
2013-09-01 10:48:18 +03:00
David S. Miller
ba39767288
Merge branch 'qlcnic'
...
Shahed Shaikh says:
====================
This patch series contains -
* Enhanced PVID handling for 84xx adapters by
not indicating PVID configuration to VF driver and
keeping VF driver in no VLAN configuration mode becasue
adapter supports VLAN stripping.
* Removed inappropriate usage of inline keyword.
* Enhanced minidump feature by using firmware recommended
dump capture mask and using CAMRAM register to store
firmware dump state.
* AER handling support for 83xx adapter.
* Added support for per port eswitch configuration.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-08-31 22:35:26 -04:00