Linus Torvalds
66dc918d42
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (348 commits)
ALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection
ALSA: hda - Add missing NID 0x19 fixup for Sony VAIO
ALSA: hda - Fix ALC275 enable hardware EQ for SONY VAIO
ALSA: oxygen: fix Xonar DG input
ALSA: hda - Fix EAPD on Lenovo NB ALC269 to low
ALSA: hda - Fix missing EAPD for Acer 4930G
ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs.
ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser
ALSA: hda - Don't refer ELD when unplugged
ASoC: tpa6130a2: Fix compiler warning
ASoC: tlv320dac33: Add DAPM selection for LOM invert
ASoC: DMIC codec: Adding a generic DMIC codec
ALSA: snd-usb-us122l: Fix missing NULL checks
ALSA: snd-usb-us122l: Fix MIDI output
ASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync()
ASoC: Fix section mismatch in wm8995.c
ALSA: oxygen: add S/PDIF source selection for Claro cards
ALSA: oxygen: fix CD/MIDI for X-Meridian (2G)
ASoC: fix migor audio build
ALSA: include delay.h for msleep in Xonar DG support
...
2011-01-13 10:32:54 -08:00
Linus Torvalds
1896a1346a
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (45 commits)
regulator: missing index in PTR_ERR() in isl6271a_probe()
regulator: Assign return value of mc13xxx_reg_rmw to ret
regulator: Add initial per-regulator debugfs support
regulator: Make regulator_has_full_constraints a bool
regulator: Clean up logging a bit
regulator: Optimise out noop voltage changes
regulator: Add API to re-apply voltage to hardware
regulator: Staticise non-exported functions in mc13892
regulator: Only notify voltage changes when they succeed
regulator: Provide a selector based set_voltage_sel() operation
regulator: Factor out voltage set operation into a separate function
regulator: Convert WM8994 to use get_voltage_sel()
regulator: Convert WM835x to use get_voltage_sel()
regulator: Allow modular build of mc13xxx-core
regulator: support PMIC mc13892
make mc13783 regulator code generic
Change the register name definitions for mc13783
mach-ux500: Updated and connected ab8500 regulator board configuration
regulators: Removed macros for initialization of ab8500 regulators
regulators: Added verbose debug messages to ab8500 regulators
...
2011-01-13 10:24:07 -08:00
Linus Torvalds
008d23e485
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
...
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
Documentation/trace/events.txt: Remove obsolete sched_signal_send.
writeback: fix global_dirty_limits comment runtime -> real-time
ppc: fix comment typo singal -> signal
drivers: fix comment typo diable -> disable.
m68k: fix comment typo diable -> disable.
wireless: comment typo fix diable -> disable.
media: comment typo fix diable -> disable.
remove doc for obsolete dynamic-printk kernel-parameter
remove extraneous 'is' from Documentation/iostats.txt
Fix spelling milisec -> ms in snd_ps3 module parameter description
Fix spelling mistakes in comments
Revert conflicting V4L changes
i7core_edac: fix typos in comments
mm/rmap.c: fix comment
sound, ca0106: Fix assignment to 'channel'.
hrtimer: fix a typo in comment
init/Kconfig: fix typo
anon_inodes: fix wrong function name in comment
fix comment typos concerning "consistent"
poll: fix a typo in comment
...
Fix up trivial conflicts in:
- drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
- fs/ext4/ext4.h
Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13 10:05:56 -08:00
Lennert Buytenhek
5b88128fd7
ARM: plat-stmp3xxx: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:19:14 +01:00
Lennert Buytenhek
0e60e117fb
ARM: plat-spear: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Viresh Kumar <viresh.kumar@st.com>
2011-01-13 17:19:13 +01:00
Lennert Buytenhek
3b0c8d4038
ARM: plat-orion: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
2011-01-13 17:19:12 +01:00
Lennert Buytenhek
e9191028e8
ARM: plat-omap: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:19:11 +01:00
Lennert Buytenhek
f272c00e6b
ARM: plat-nomadik: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Rabin Vincent <rabin.vincent@stericsson.com>
2011-01-13 17:19:10 +01:00
Lennert Buytenhek
4d93579f63
ARM: plat-mxc: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:19:09 +01:00
Lennert Buytenhek
b9858efad3
ARM: w90x900: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
2011-01-13 17:19:07 +01:00
Lennert Buytenhek
80cf22c4a6
ARM: versatile: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
2011-01-13 17:19:06 +01:00
Lennert Buytenhek
37337a8d5e
ARM: tegra: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:19:04 +01:00
Lennert Buytenhek
76fbec842e
ARM: tcc8k: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:19:03 +01:00
Lennert Buytenhek
cb55bc5f1b
ARM: stmp37xx: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:19:02 +01:00
Lennert Buytenhek
7940848aab
ARM: stmp378x: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:19:01 +01:00
Lennert Buytenhek
aab0c637f3
ARM: shark: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:19:00 +01:00
Lennert Buytenhek
c4e8964e4e
ARM: sa1100: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:58 +01:00
Lennert Buytenhek
9a364da73d
ARM: rpc: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
2011-01-13 17:18:57 +01:00
Lennert Buytenhek
a3f4c927d3
ARM: PXA SoCs: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:56 +01:00
Lennert Buytenhek
406b005045
ARM: pnx4008: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:54 +01:00
Lennert Buytenhek
df303477bd
ARM: omap2: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:52 +01:00
Lennert Buytenhek
a51eef7eb4
ARM: omap1: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:51 +01:00
Lennert Buytenhek
85dcd90ce1
ARM: nuc93x: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
2011-01-13 17:18:50 +01:00
Lennert Buytenhek
9b3ffe523a
ARM: ns9xxx: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2011-01-13 17:18:49 +01:00
Lennert Buytenhek
4f8d7541b5
ARM: netx: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:48 +01:00
Lennert Buytenhek
e981a30209
ARM: mx3: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:47 +01:00
Lennert Buytenhek
0f86ee082c
ARM: msm: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Gregory Bean <gbean@codeaurora.org>
Acked-by: Daniel Walker <dwalker@codeaurora.org>
2011-01-13 17:18:46 +01:00
Lennert Buytenhek
a157f26b2e
ARM: mmp: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:45 +01:00
Lennert Buytenhek
5638538117
ARM: lpc32xx: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:44 +01:00
Lennert Buytenhek
3b7cff6604
ARM: lh7a40x: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:43 +01:00
Lennert Buytenhek
3cdb791bda
ARM: ks8695: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:41 +01:00
Lennert Buytenhek
ee04087add
ARM: ixp4xx: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:40 +01:00
Lennert Buytenhek
c1d065e696
ARM: ixp23xx: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:39 +01:00
Lennert Buytenhek
6e8f54fad5
ARM: ixp2000: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:38 +01:00
Lennert Buytenhek
a0ad2a7e6b
ARM: iop33x: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Dan Williams <dan.j.williams@intel.com>
2011-01-13 17:18:37 +01:00
Lennert Buytenhek
465b40794c
ARM: iop32x: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Dan Williams <dan.j.williams@intel.com>
2011-01-13 17:18:36 +01:00
Lennert Buytenhek
418c9904d3
ARM: iop13xx: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Dan Williams <dan.j.williams@intel.com>
2011-01-13 17:18:35 +01:00
Lennert Buytenhek
c3ef3ccadb
ARM: integrator: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
2011-01-13 17:18:34 +01:00
Lennert Buytenhek
c971ab0d96
ARM: h720x: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:33 +01:00
Lennert Buytenhek
413802b6c8
ARM: gemini: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
2011-01-13 17:18:31 +01:00
Lennert Buytenhek
dc2caf6c69
ARM: footbridge: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
2011-01-13 17:18:30 +01:00
Lennert Buytenhek
c0afc91602
ARM: ep93xx: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Ryan Mallon <ryan@bluewatersys.com>
2011-01-13 17:18:29 +01:00
Lennert Buytenhek
c365e506d1
ARM: ebsa110: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
2011-01-13 17:18:28 +01:00
Lennert Buytenhek
aa456a6eba
ARM: dove: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
2011-01-13 17:18:27 +01:00
Lennert Buytenhek
23265442b0
ARM: davinci: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:26 +01:00
Lennert Buytenhek
8ad357ca4d
ARM: clps711x: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:24 +01:00
Lennert Buytenhek
cf1d4d5099
ARM: bcmring: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Scott Branden <sbranden@broadcom.com>
2011-01-13 17:18:23 +01:00
Lennert Buytenhek
da0f9403d4
ARM: at91: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:22 +01:00
Lennert Buytenhek
54502602c1
ARM: aaec2000: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:21 +01:00
Lennert Buytenhek
f013c98dd2
ARM: vic: irq_data conversion.
...
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
2011-01-13 17:18:20 +01:00