summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
*---. Merge remote-tracking branches 'asoc/topic/link-param', 'asoc/topic/max98090'...Mark Brown2015-04-122-0/+4
|\ \ \
| * | | ASoC: dapm: add code to configure dai link parametersNikesh Oswal2015-03-172-0/+4
| |/ /
* | | Merge remote-tracking branch 'asoc/topic/intel' into asoc-nextMark Brown2015-04-121-0/+1
|\ \ \
| * \ \ Merge branch 'topic/jack' of git://git.kernel.org/pub/scm/linux/kernel/git/br...Mark Brown2015-03-171-3/+5
| |\ \ \
| * \ \ \ Merge branch 'topic/rt5670' of git://git.kernel.org/pub/scm/linux/kernel/git/...Mark Brown2015-03-171-0/+1
| |\ \ \ \
| | * | | | ASoC: rt5670: Add IRQ functionBard Liao2015-03-111-0/+1
| | | |_|/ | | |/| |
| * | | | Merge tag 'v4.0-rc3' into asoc-intelMark Brown2015-03-1119-64/+164
| |\| | |
* | | | | Merge remote-tracking branch 'asoc/topic/dapm' into asoc-nextMark Brown2015-04-122-1/+13
|\ \ \ \ \
| * | | | | ASoC: Make snd_soc_dapm_kcontrol_codec() inlineLars-Peter Clausen2015-03-162-1/+13
| | |_|_|/ | |/| | |
* | | | | Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown2015-04-122-3/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'topic/dapm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git...Mark Brown2015-04-101-0/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'topic/delay' of git://git.kernel.org/pub/scm/linux/kernel/git/b...Mark Brown2015-04-101-2/+0
| |\ \ \ \ \ \
| | * | | | | | ASoC: dapm: Remove delayed_work from dapm context structLars-Peter Clausen2015-04-011-1/+0
| | * | | | | | ASoC: Remove suspend_bias_level from DAPM context structLars-Peter Clausen2015-04-011-1/+0
| | | |/ / / / | | |/| | | |
| * | | | | | ASoC: Make soc_dpcm_debugfs_add() non-fatalLars-Peter Clausen2015-04-091-1/+1
* | | | | | | Merge tag 'asoc-v4.1' into asoc-nextMark Brown2015-04-122-3/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| | | | | | |
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *-----. | | | | | Merge remote-tracking branches 'asoc/topic/jack', 'asoc/topic/max98357a', 'as...Mark Brown2015-03-051-3/+5
| |\ \ \ \| | | | | | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | ASoC: Remove snd_soc_jack_new()Lars-Peter Clausen2015-03-041-20/+0
| | * | | | | | | ASoC: Allow to register jacks at the card levelLars-Peter Clausen2015-03-041-3/+25
| | | |_|/ / / / | | |/| | | | |
| | | | | | | |
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| *-----. \ \ \ \ \ \ Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/davinci', 'aso...Mark Brown2015-03-052-0/+10
| |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| / / / / / | | | | |_|/ / / / / | | | |/| | / / / / | | | |_|_|/ / / / | | |/| | | | / / | | | | | | |/ / | | | | | |/| |
| | | | | * | | ASoC: core: allow pcms to be registered as nonatomicVinod Koul2015-02-241-0/+3
| | | | | * | | ALSA: Add params_set_format helperFang, Yang A2015-02-241-0/+7
| | | | |/ / /
| | | | | | |
| | | | \ \ \
| | | | \ \ \
| | | | \ \ \
| | | *---. \ \ \ Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sta32x', 'aso...Mark Brown2015-02-092-5/+14
| | | |\ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | | | | | | |
| | | | \ \ \ \ \
| | | | \ \ \ \ \
| | | | \ \ \ \ \
| | | *---. \ \ \ \ \ Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'aso...Mark Brown2015-02-091-0/+8
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | | | | | | | | |
| | | | \ \ \ \ \ \ \
| | | *-. \ \ \ \ \ \ \ Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/rcar' and 'asoc/...Mark Brown2015-02-091-0/+1
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | | | | | | | | | |
| | | | \ \ \ \ \ \ \ \
| | | *-. \ \ \ \ \ \ \ \ Merge remote-tracking branches 'asoc/topic/cs42l73', 'asoc/topic/dai' and 'as...Mark Brown2015-02-091-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge remote-tracking branch 'asoc/topic/w-codec' into asoc-nextMark Brown2015-02-092-1/+3
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-nextMark Brown2015-02-091-0/+12
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown2015-02-091-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \ \
| | | *-. \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branches 'asoc/fix/ac97', 'asoc/fix/atmel', 'asoc/fix/i...Mark Brown2015-02-091-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge tag 'asoc-v3.19-rc2' into asoc-linusMark Brown2015-02-091-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'asoc/topic/dapm-dt' into asoc-nextMark Brown2015-03-051-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | ASoC: core: Add extra dapm properties for Device TreeNicolin Chen2015-02-241-0/+5
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2015-04-064-17/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | ipv6: protect skb->sk accesses from recursive dereference inside the stackhannes@stressinduktion.org2015-04-064-17/+10
* | | | | | | | | | | | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2015-04-031-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Input: add MT_TOOL_PALMCharlie Mooney2015-03-201-1/+2
* | | | | | | | | | | | | | | | | | | Merge branch 'for-linus' of git://git.kernel.dk/linux-blockLinus Torvalds2015-04-031-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | block: fix blk_stack_limits() regression due to lcm() changeMike Snitzer2015-03-311-0/+1
* | | | | | | | | | | | | | | | | | | | Merge tag 'irqchip-fixes-4.0-2' of git://git.infradead.org/users/jcooper/linuxLinus Torvalds2015-04-021-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | irqchip: gicv3-its: Use non-cacheable accesses when no shareabilityMarc Zyngier2015-03-291-0/+4
| * | | | | | | | | | | | | | | | | | | irqchip: gicv3-its: Fix PROP/PEND and BASE/CBASE confusionMarc Zyngier2015-03-291-0/+13
* | | | | | | | | | | | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2015-04-021-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | usbnet: Fix tx_bytes statistic running backward in cdc_ncmBen Hutchings2015-03-291-2/+4
| * | | | | | | | | | | | | | | | | | | | usbnet: Fix tx_packets stat for FLAG_MULTI_FRAME driversBen Hutchings2015-03-291-0/+12
* | | | | | | | | | | | | | | | | | | | | Merge tag 'lazytime_fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tyt...Linus Torvalds2015-04-012-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | fs: add dirtytime_expire_seconds sysctlTheodore Ts'o2015-03-171-0/+3
| * | | | | | | | | | | | | | | | | | | | | fs: make sure the timestamps for lazytime inodes eventually get writtenTheodore Ts'o2015-03-171-0/+1
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2015-04-012-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | sunrpc: make debugfs file creation failure non-fatalJeff Layton2015-03-311-9/+9