Revision tags: v3.0, v3.0-rc7 |
|
#
b7e9c223 |
| 11-Jul-2011 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply pending patches that are based on newer code already present upstream.
|
#
0c9e98af |
| 05-Jul-2011 |
Greg Kroah-Hartman <gregkh@suse.de> |
Merge Linux 3.0-rc6 into staging-next
This handles the merge conflicts with the drivers/staging/brcm80211/Kconfig file due to changes on the two different branches.
Signed-off-by: Greg Kroah-Hartma
Merge Linux 3.0-rc6 into staging-next
This handles the merge conflicts with the drivers/staging/brcm80211/Kconfig file due to changes on the two different branches.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
Revision tags: v3.0-rc6 |
|
#
04bf7869 |
| 01-Jul-2011 |
Jens Axboe <jaxboe@fusionio.com> |
Merge branch 'for-linus' into for-3.1/core
Conflicts: block/blk-throttle.c block/cfq-iosched.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
|
#
36b2e922 |
| 01-Jul-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v3.0-rc5' into sched/core
Merge reason: Move to a (much) newer base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
5b944a71 |
| 30-Jun-2011 |
James Morris <jmorris@namei.org> |
Merge branch 'linus' into next
|
#
6da49a29 |
| 30-Jun-2011 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge remote branch 'origin/master' into next
|
Revision tags: v3.0-rc5 |
|
#
74d83b7e |
| 23-Jun-2011 |
Nicholas Bellinger <nab@linux-iscsi.org> |
Merge tag 'v3.0-rc4' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
|
#
2cd1176b |
| 21-Jun-2011 |
Keith Packard <keithp@keithp.com> |
Merge branch 'drm-intel-fixes' into drm-intel-next
|
#
9f6ec8d6 |
| 21-Jun-2011 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-agn-rxon.c drivers/net/wireless/rtlwifi/pci.c net/netfilter/ipvs/ip_
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-agn-rxon.c drivers/net/wireless/rtlwifi/pci.c net/netfilter/ipvs/ip_vs_core.c
show more ...
|
Revision tags: v3.0-rc4 |
|
#
f8db4cc4 |
| 17-Jun-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge branch 'spi/merge' into spi/next
|
#
b4f9f2b6 |
| 16-Jun-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v3.0-rc3' into perf/core
Merge reason: add the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
2bc7c852 |
| 15-Jun-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge branch 'gpio/next-tegra' into gpio/next
Conflicts: drivers/gpio/Kconfig drivers/gpio/Makefile
|
#
fc90ec86 |
| 15-Jun-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'fbdev/panning-fixes'
|
#
dcc85457 |
| 14-Jun-2011 |
Greg Kroah-Hartman <gregkh@suse.de> |
Merge 3.0-rc2 into usb-linus as it's needed by some USB patches
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
#
b8ce9fb8 |
| 14-Jun-2011 |
Tony Lindgren <tony@atomide.com> |
Merge branch 'fixes-v3.0-rc3' into devel-fixes
|
#
9aa7719e |
| 14-Jun-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
|
Revision tags: v3.0-rc3 |
|
#
5ab775c7 |
| 13-Jun-2011 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/hda' into topic/hda
|
#
9d6fa8fa |
| 12-Jun-2011 |
Linus Torvalds <torvalds@linux-foundation.org> |
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: ALSA: hda: Fix inaudible i
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: ALSA: hda: Fix inaudible internal speakers on CyberpowerPC Gamer Xplorer N57001 laptop ALSA: Use %pV for snd_printk() ALSA: hda - Fix initialization of hp pins with master_mute in Realtek ALSA: hda - Fix invalid unsol tag for some alc262 model quirks ASoC: SAMSUNG: Fix the incorrect referencing of I2SCON register ASoC: snd_soc_new_{mixer,mux,pga} make sure to use right DAPM context ASoC: fsl: fix initialization of DMA buffers ASoC: WM8804 does not support sample rates below 32kHz ASoC: Fix WM8962 headphone volume update for use of advanced caches ASoC: Blackfin: bf5xx-ad1836: Fix codec device name ALSA: hda: Fix quirk for Dell Inspiron 910 ASoC: AD1836: Fix setting the PCM format ASoC: Check for NULL register bank in snd_soc_get_cache_val() ASoC: Add missing break in WM8915 FLL source selection ASoC: Only update SYSCLK_ENA when pausing WM8915 SYSCLK ASoC: atmel_ssc: Don't try to free ssc if request failed
show more ...
|
#
05e20542 |
| 10-Jun-2011 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/asoc' into for-linus
|
#
bf564ea9 |
| 09-Jun-2011 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-3.0' into for-3.1
|
#
147dfe90 |
| 08-Jun-2011 |
Timur Tabi <timur@freescale.com> |
ASoC: p1022ds: fix incorrect referencing of device tree properties
Device tree integer properties are encoded in big-endian format, but some of the Freescale ASoC drivers were assuming that the host
ASoC: p1022ds: fix incorrect referencing of device tree properties
Device tree integer properties are encoded in big-endian format, but some of the Freescale ASoC drivers were assuming that the host is in big-endian format as well. Although this is true, it's better to use endian-safe accessors.
Also add a check for a failed ioremap() call in the SSI driver.
Signed-off-by: Timur Tabi <timur@freescale.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
show more ...
|
#
0cd114ff |
| 08-Jun-2011 |
Timur Tabi <timur@freescale.com> |
ASoC: fsl: fix initialization of DMA buffers
The DMA (PCM) driver used by some Freescale PowerPC supports separate DAIs for playback and capture, so DMA buffers should be allocated only for the init
ASoC: fsl: fix initialization of DMA buffers
The DMA (PCM) driver used by some Freescale PowerPC supports separate DAIs for playback and capture, so DMA buffers should be allocated only for the initialized streams. Instead of checking for the number of active channels, which apparently is not reliable, check to see if the actual stream object exists.
Also provide a better name for the DMA interrupt.
Signed-off-by: Timur Tabi <timur@freescale.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
show more ...
|
#
552d1ef6 |
| 07-Jun-2011 |
Liam Girdwood <lrg@ti.com> |
ASoC: core - Optimise and refactor pcm_new() to pass only rtd
Currently pcm_new() passes in 3 arguments :- card, pcm and DAI.
Refactor this to only pass in 1 argument (i.e. the rtd) since struct rt
ASoC: core - Optimise and refactor pcm_new() to pass only rtd
Currently pcm_new() passes in 3 arguments :- card, pcm and DAI.
Refactor this to only pass in 1 argument (i.e. the rtd) since struct rtd contains card, pcm and DAI along with other members too that are useful too.
Signed-off-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
show more ...
|
Revision tags: v3.0-rc2, v3.0-rc1 |
|
#
6288cf1e |
| 29-May-2011 |
Len Brown <len.brown@intel.com> |
Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release
|
#
ea77f7a2 |
| 26-May-2011 |
Eric Paris <eparis@redhat.com> |
Merge commit 'v2.6.39' into 20110526
Conflicts: lib/flex_array.c security/selinux/avc.c security/selinux/hooks.c security/selinux/ss/policydb.c security/smack/smack_lsm.c
|